From b66141e2523e03c3b71874fc2c7ae6989af7b335 Mon Sep 17 00:00:00 2001 From: rbong Date: Wed, 26 Dec 2018 10:06:46 -0500 Subject: [PATCH] Open todo file on Grebase --edit-todo --- autoload/fugitive.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index 291adb6..12054c0 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -2321,7 +2321,7 @@ let s:common_efm = '' function! s:Merge(cmd, bang, mods, args) abort let mods = substitute(a:mods, '\C', '', '') . ' ' - 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()