From: Felipe Contreras Date: Fri, 30 Aug 2013 05:56:10 GMT Subject: [PATCH v6 16/28] rebase: cherry-pick: fix abort of cherry mode Message-ID: <1377842182-18724-17-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1377842182-18724-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 b28addc..db2ea8d 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -368,6 +368,7 @@ skip) run_specific_rebase ;; abort) + test "$type" == "cherrypick" && git cherry-pick --abort git rerere clear read_basic_state case "$head_name" in -- 1.8.4-fc