motiejus/dotfiles

commit 6bc345f6f16aee0dcc361f2f3bf80e4964f461af (tree)
parent def982ac4d81700a03ad9f0fc4233437f3d65b77
Author: Tim Pope <code@tpope.net>
Date:   Fri, 10 Jan 2020 19:56:08 -0500

Map cmt to :Git mergetool

References https://github.com/tpope/vim-fugitive/issues/1329

Diffstat:
M
autoload/fugitive.vim
 | 
1
+
M
doc/fugitive.txt
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -5946,6 +5946,7 @@ function! fugitive#MapJumps(...) abort
 
     nnoremap <buffer>      cm<Space> :Git merge<Space>
     nnoremap <buffer>         cm<CR> :Git merge<CR>
+    nnoremap <buffer>          cmt   :Git mergetool
     nnoremap <buffer> <silent> cm?   :help fugitive_cm<CR>
 
     nnoremap <buffer>      cz<Space> :Git stash<Space>
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
@@ -111,7 +111,7 @@ that are part of Git repositories).
                         change unless [!] is given.
 
 :Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a
-                        new tab, and invoke `:Gdiffsplit` against the
+                        new tab, and invoke `:Gdiffsplit!` against the
                         appropriate commit.
 
                                                 *:Git-mergetool*