Provide :Grevert and :Gmerge mappings
This commit is contained in:
parent
0f08b0cbbb
commit
bd70719f54
@ -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><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> <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> 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<CR> :G stash<CR>
|
||||
nnoremap <buffer> <silent> cza :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR>
|
||||
|
@ -426,10 +426,19 @@ cS Create a `squash!` commit for the commit under the
|
||||
cA Create a `squash!` commit for the commit under the
|
||||
cursor and edit the message.
|
||||
|
||||
cr Revert the commit under the cursor.
|
||||
|
||||
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.
|
||||
|
||||
*fugitive_cb*
|
||||
|
Loading…
Reference in New Issue
Block a user