vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Provide :Grevert and :Gmerge mappings

Browse Source
This commit is contained in:
Tim Pope 2019-08-03 21:35:46 -04:00
parent 0f08b0cbbb
commit bd70719f54
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
autoload/fugitive.vim
View File

@ -5115,10 +5115,19 @@ function! fugitive#MapJumps(...) abort
nnoremap <buffer> cs :<C-U>Gcommit --squash=<C-R>=<SID>SquashArgument()<CR> nnoremap <buffer> cs :<C-U>Gcommit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cS :<C-U><Bar>Grebase --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Gcommit --squash=<C-R>=<SID>SquashArgument()<CR> nnoremap <buffer> cS :<C-U><Bar>Grebase --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Gcommit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cA :<C-U>Gcommit --edit --squash=<C-R>=<SID>SquashArgument()<CR> nnoremap <buffer> cA :<C-U>Gcommit --edit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> <silent> cr :<C-U>Grevert <C-R>=<SID>SquashArgument()<CR><CR>
nnoremap <buffer> <silent> cR :<C-U>Grevert <C-R>=<SID>SquashArgument()<CR><CR>
nnoremap <buffer> <silent> c? :<C-U>help fugitive_c<CR> nnoremap <buffer> <silent> c? :<C-U>help fugitive_c<CR>
nnoremap <buffer> cr<Space> :Grevert<Space>
nnoremap <buffer> cr<CR> :Grevert<CR>
nnoremap <buffer> <silent> crc :<C-U>Grevert <C-R>=<SID>SquashArgument()<CR><CR>
nnoremap <buffer> <silent> crn :<C-U>Grevert --no-commit <C-R>=<SID>SquashArgument()<CR><CR>
nnoremap <buffer> <silent> cR :<C-U>Grevert <C-R>=<SID>SquashArgument()<CR><CR>
nnoremap <buffer> <silent> cr? :help fugitive_cr<CR>
nnoremap <buffer> cm<Space> :Gmerge<Space>
nnoremap <buffer> cm<CR> :Gmerge<CR>
nnoremap <buffer> <silent> cm? :help fugitive_cm<CR>
nnoremap <buffer> cz<Space> :G stash<Space> nnoremap <buffer> cz<Space> :G stash<Space>
nnoremap <buffer> cz<CR> :G stash<CR> nnoremap <buffer> cz<CR> :G stash<CR>
nnoremap <buffer> <silent> cza :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> <silent> cza :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR>

13
doc/fugitive.txt
View File

@ -426,10 +426,19 @@ cS Create a `squash!` commit for the commit under the
cA Create a `squash!` commit for the commit under the cA Create a `squash!` commit for the commit under the
cursor and edit the message. cursor and edit the message.
cr Revert the commit under the cursor.
c<Space> Populate command line with ":Gcommit ". c<Space> Populate command line with ":Gcommit ".
*fugitive_cr*
crc Revert the commit under the cursor.
crn Revert the commit under the cursor in the index and
work tree, but do not actually commit the changes.
cr<Space> Populate command line with ":Grevert ".
*fugitive_cm*
cm<Space> Populate command line with ":Gmerge ".
c? Show this help. c? Show this help.
*fugitive_cb* *fugitive_cb*