diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index eca6893..88e1502 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -3695,12 +3695,14 @@ function! fugitive#MapJumps(...) abort let nowait = v:version >= 704 ? '' : '' if get(b:, 'fugitive_type', '') ==# 'blob' nnoremap o :.,.+1Gblame - nnoremap S :vertical .,.+1Gblame + nnoremap S :echoerr 'Use gO' + nnoremap gO :vertical .,.+1Gblame nnoremap O :tab .,.+1Gblame nnoremap p :.,.+2Gblame else nnoremap o :exe GF("split") - nnoremap S :exe GF("vsplit") + nnoremap S :echoerr 'Use gO' + nnoremap gO :exe GF("vsplit") nnoremap O :exe GF("tabedit") nnoremap p :exe GF("pedit") endif @@ -3710,7 +3712,8 @@ function! fugitive#MapJumps(...) abort nnoremap C :exe 'Gedit ' . fnameescape(ContainingCommit()) nnoremap cc :exe 'Gedit ' . fnameescape(ContainingCommit()) nnoremap co :exe 'Gsplit ' . fnameescape(ContainingCommit()) - nnoremap cS :exe 'Gvsplit ' . fnameescape(ContainingCommit()) + nnoremap cS :echoerr 'Use cgO' + nnoremap cgO :exe 'Gvsplit ' . fnameescape(ContainingCommit()) nnoremap cO :exe 'Gtabedit ' . fnameescape(ContainingCommit()) nnoremap cp :exe 'Gpedit ' . fnameescape(ContainingCommit()) nnoremap cf :Gcommit --fixup==SquashArgument() diff --git a/doc/fugitive.txt b/doc/fugitive.txt index c6bab86..78c6388 100644 --- a/doc/fugitive.txt +++ b/doc/fugitive.txt @@ -55,17 +55,17 @@ that are part of Git repositories). dp |:Git!| diff (p for patch; use :Gw to apply) dp |:Git| add --intent-to-add (untracked files) dv |:Gvdiff| + gO |:Gvsplit| + g| |:Git| checkout + g| |:Git| checkout HEAD (staged files) + g| |:Git| clean (untracked files) + g| |:Git| rm (unmerged files) O |:Gtabedit| o |:Gsplit| P |:Git| add --patch P |:Git| reset --patch (staged files) q close status r reload status - S |:Gvsplit| - g| |:Git| checkout - g| |:Git| checkout HEAD (staged files) - g| |:Git| clean (untracked files) - g| |:Git| rm (unmerged files) . enter |:| command line with file prepopulated *fugitive-:Gcommit* @@ -287,8 +287,8 @@ These maps are available in committed Git objects. o Jump to the |fugitive-object| under the cursor in a new split. - *fugitive-S* -S Jump to the |fugitive-object| under the cursor in a + *fugitive-gO* +gO Jump to the |fugitive-object| under the cursor in a new vertical split. *fugitive-O*