m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 13:23:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't rely on rebase --autosquash shorthand

Browse Source 
I'm starting to think this is more confusing than helpful.
This commit is contained in:
Tim Pope
2020-02-29 22:53:42 -05:00
parent d102dd92fd
commit 8aaf744f2a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/fugitive.vim
View File

@@ -3607,7 +3607,7 @@ function! s:DoToggleUnpulled(record) abort
endfunction
function! s:DoUnstageUnpushed(record) abort
call feedkeys(':Git rebase --autosquash ' . a:record.commit . '^')
call feedkeys(':Git -c sequence.editor=true rebase --interactive --autosquash ' . a:record.commit . '^')
endfunction
function! s:DoToggleStagedHeading(...) abort
@@ -5945,9 +5945,9 @@ function! fugitive#MapJumps(...) abort
nnoremap <buffer> <silent> cRe :<C-U>Git commit --reset-author --amend --no-edit<CR>
nnoremap <buffer> <silent> cRw :<C-U>Git commit --reset-author --amend --only<CR>
nnoremap <buffer> cf :<C-U>Git commit --fixup=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cF :<C-U><Bar>Git rebase --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --fixup=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cF :<C-U><Bar>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --fixup=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cs :<C-U>Git commit --no-edit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cS :<C-U><Bar>Git rebase --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --no-edit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cS :<C-U><Bar>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --no-edit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> cA :<C-U>Git commit --edit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> <silent> c? :<C-U>help fugitive_c<CR>
@@ -5985,7 +5985,7 @@ function! fugitive#MapJumps(...) abort
nnoremap <buffer> r<Space> :Git rebase<Space>
nnoremap <buffer> r<CR> :Git rebase<CR>
nnoremap <buffer> <silent> ri :<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><CR>
nnoremap <buffer> <silent> rf :<C-U>Git rebase --autosquash<C-R>=<SID>RebaseArgument()<CR><CR>
nnoremap <buffer> <silent> rf :<C-U>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><CR>
nnoremap <buffer> <silent> ru :<C-U>Git rebase --interactive @{upstream}<CR>
nnoremap <buffer> <silent> rp :<C-U>Git rebase --interactive @{push}<CR>
nnoremap <buffer> <silent> rw :<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><Bar>s/^pick/reword/e<CR>