diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index 3e6bd62..7df1f2c 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -4887,14 +4887,14 @@ function! fugitive#MapJumps(...) abort nnoremap P :exe 'Gedit ' . fnameescape(ContainingCommit().'^'.v:count1.Relative(':')) nnoremap ~ :exe 'Gedit ' . fnameescape(ContainingCommit().'~'.v:count1.Relative(':')) nnoremap C :exe 'Gedit ' . fnameescape(ContainingCommit()) - - nnoremap c- :Gcommit - - nnoremap c :Gcommit - nnoremap c :Gcommit nnoremap co :echoerr 'Use CTRL-W sC' nnoremap cp :echoerr 'Use gC' nnoremap gC :exe 'Gpedit ' . fnameescape(ContainingCommit()) nnoremap gc :exe 'Gpedit ' . fnameescape(ContainingCommit()) + + nnoremap c- :Gcommit - + nnoremap c :Gcommit + nnoremap c :Gcommit nnoremap ca :Gcommit --amend nnoremap cc :Gcommit nnoremap ce :Gcommit --amend --no-edit @@ -4906,6 +4906,8 @@ function! fugitive#MapJumps(...) abort nnoremap cs :Gcommit --squash==SquashArgument() nnoremap cS :Grebase --autosquash=RebaseArgument()Gcommit --squash==SquashArgument() nnoremap cA :Gcommit --edit --squash==SquashArgument() + nnoremap c? :help fugitive_c + nnoremap r- :Grebase - nnoremap r :Grebase nnoremap r :Grebase @@ -4922,9 +4924,11 @@ function! fugitive#MapJumps(...) abort nnoremap rs :Grebase --skip nnoremap re :Grebase --edit-todo nnoremap ra :Grebase --abort + nnoremap r? :help fugitive_r + nnoremap . : =fnameescape(fugitive#Real(@%)) xnoremap . : =fnameescape(fugitive#Real(@%)) - nnoremap g? :help fugitive-mappings + nnoremap g? :help fugitive-mappings endif endfunction diff --git a/doc/fugitive.txt b/doc/fugitive.txt index b02ba1e..c78d12e 100644 --- a/doc/fugitive.txt +++ b/doc/fugitive.txt @@ -382,6 +382,8 @@ 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. +c? Show this help. + *fugitive_r* Rebase mappings ~ @@ -414,6 +416,8 @@ rm Perform an interactive rebase with the commit under rd Perform an interactive rebase with the commit under the cursor set to `drop`. +r? Show this help. + *fugitive-misc-mappings* Miscellaneous mappings ~ @@ -425,7 +429,7 @@ gq Close the status buffer. cursor prepopulated. *fugitive_g?* -g? Open this help. +g? Show help for |fugitive-mappings|. *fugitive-global-mappings* Global mappings ~