vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Open todo file on Grebase --edit-todo

Browse Source
This commit is contained in:
rbong 2018-12-26 10:06:46 -05:00 committed by Tim Pope
parent ae8fed6dd3
commit b66141e252
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/fugitive.vim
View File

@ -2321,7 +2321,7 @@ let s:common_efm = ''
function! s:Merge(cmd, bang, mods, args) abort
let mods = substitute(a:mods, '\C<mods>', '', '') . ' '
if a:cmd =~# '^rebase' && ' '.a:args =~# ' -i\| --interactive\| --edit-todo'
if a:cmd =~# '^rebase' && ' '.a:args =~# ' -i\| --interactive'
return 'echoerr "git rebase --interactive not supported"'
endif
let [mp, efm] = [&l:mp, &l:efm]
@ -2383,6 +2383,8 @@ function! s:Merge(cmd, bang, mods, args) abort
elseif a:cmd =~# '^rebase' && ' '.a:args =~# ' --continue' && s:HasRebaseCommitCmd()
cclose
return mods . 'Gcommit --amend'
elseif a:cmd =~# '^rebase' && ' '.a:args =~# ' --edit-todo'
return mods . 'Gsplit ' . s:fnameescape(b:git_dir . '/rebase-merge/git-rebase-todo') . ' | setlocal bufhidden=wipe nobuflisted'
endif
endif
let qflist = getqflist()