From d3a2bdbe2c63d588241f0351ead61eae74323186 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Fri, 6 Dec 2019 14:12:35 -0500
Subject: [PATCH] Don't abort rebase after committing on last step

References https://github.com/tpope/vim-fugitive/issues/1329
---
 autoload/fugitive.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index e818e5d..153bde6 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -3769,7 +3769,7 @@ augroup fugitive_merge
         \ endif
   autocmd BufEnter * nested
         \ if exists('s:rebase_continue') |
-        \   exe s:MergeRebase('rebase', 0, '', [getfsize(fugitive#Find('.git/rebase-merge/git-rebase-todo', s:rebase_continue)) > 0 ? '--continue' : '--abort'], remove(s:, 'rebase_continue')) |
+        \   exe s:MergeRebase('rebase', 0, '', [getfsize(fugitive#Find('.git/rebase-merge/git-rebase-todo', s:rebase_continue)) >= 0 + (expand('<afile>:t') ==# 'git-rebase-todo') ? '--continue' : '--abort'], remove(s:, 'rebase_continue')) |
         \ endif
 augroup END