m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-10 12:33:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Map cmt to :Git mergetool

Browse Source 
References https://github.com/tpope/vim-fugitive/issues/1329
This commit is contained in:
Tim Pope
2020-01-10 19:56:08 -05:00
parent def982ac4d
commit 6bc345f6f1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
autoload/fugitive.vim
View File

@@ -5946,6 +5946,7 @@ function! fugitive#MapJumps(...) abort
nnoremap <buffer> cm<Space> :Git merge<Space> nnoremap <buffer> cm<Space> :Git merge<Space>
nnoremap <buffer> cm<CR> :Git merge<CR> nnoremap <buffer> cm<CR> :Git merge<CR>
nnoremap <buffer> cmt :Git mergetool
nnoremap <buffer> <silent> cm? :help fugitive_cm<CR> nnoremap <buffer> <silent> cm? :help fugitive_cm<CR>
nnoremap <buffer> cz<Space> :Git stash<Space> nnoremap <buffer> cz<Space> :Git stash<Space>

2
doc/fugitive.txt
View File

@@ -111,7 +111,7 @@ that are part of Git repositories).
change unless [!] is given. change unless [!] is given.
:Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a :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. appropriate commit.
*:Git-mergetool* *:Git-mergetool*