diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index 7ca2f39..8475ecd 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -4069,6 +4069,17 @@ function! fugitive#MapJumps(...) abort nnoremap cf :Gcommit --fixup==SquashArgument() nnoremap cs :Gcommit --squash==SquashArgument() nnoremap cA :Gcommit --edit --squash==SquashArgument() + nnoremap ri :Grebase --interactive=substitute(SquashArgument(),'.\+',' &^','') + nnoremap rf :Grebase --autosquash=substitute(SquashArgument(),'.\+',' &^','') + nnoremap ru :Grebase --interactive @{upstream} + nnoremap rp :Grebase --interactive @{push} + nnoremap rw :exe 'Grebase --interactive=substitute(SquashArgument(),'.\+',' &^','')'s/^pick/reword/e + nnoremap rm :exe 'Grebase --interactive=substitute(SquashArgument(),'.\+',' &^','')'s/^pick/edit/e + nnoremap rk :exe 'Grebase --interactive=substitute(SquashArgument(),'.\+',' &^','')'s/^pick/drop/e + nnoremap rr :Grebase --continue + nnoremap rs :Grebase --skip + nnoremap re :Grebase --edit-todo + nnoremap ra :Grebase --abort nmap . : endif endfunction diff --git a/doc/fugitive.txt b/doc/fugitive.txt index b9df1f0..8e8ee8f 100644 --- a/doc/fugitive.txt +++ b/doc/fugitive.txt @@ -69,7 +69,7 @@ that are part of Git repositories). X |:Git| clean (untracked files) X |:Git| rm (unmerged files) q close status - r reload status + R reload status . enter |:| command line with file prepopulated *fugitive-:Gcommit*