From: Felipe Contreras Date: Tue, 28 May 2013 13:29:16 GMT Subject: [PATCH 4/5] rebase: fix abort of cherry mode Message-ID: <1369747757-10192-5-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1369747757-10192-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index b7759d5..48bd1b8 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -335,6 +335,7 @@ skip) run_specific_rebase ;; abort) + test "$type" == "cherry" && git cherry-pick --abort git rerere clear read_basic_state case "$head_name" in -- 1.8.3.rc3.312.g47657de