diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index d171a17..3c4796f 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -5115,10 +5115,19 @@ function! fugitive#MapJumps(...) abort nnoremap cs :Gcommit --squash==SquashArgument() nnoremap cS :Grebase --autosquash=RebaseArgument()Gcommit --squash==SquashArgument() nnoremap cA :Gcommit --edit --squash==SquashArgument() - nnoremap cr :Grevert =SquashArgument() - nnoremap cR :Grevert =SquashArgument() nnoremap c? :help fugitive_c + nnoremap cr :Grevert + nnoremap cr :Grevert + nnoremap crc :Grevert =SquashArgument() + nnoremap crn :Grevert --no-commit =SquashArgument() + nnoremap cR :Grevert =SquashArgument() + nnoremap cr? :help fugitive_cr + + nnoremap cm :Gmerge + nnoremap cm :Gmerge + nnoremap cm? :help fugitive_cm + nnoremap cz :G stash nnoremap cz :G stash nnoremap cza :exe EchoExec(['stash', 'apply', '--quiet', '--index', 'stash@{' . v:count . '}']) diff --git a/doc/fugitive.txt b/doc/fugitive.txt index 8de7be4..542edcd 100644 --- a/doc/fugitive.txt +++ b/doc/fugitive.txt @@ -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 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 Populate command line with ":Grevert ". + + *fugitive_cm* +cm Populate command line with ":Gmerge ". + c? Show this help. *fugitive_cb*