From: Felipe Contreras Date: Wed, 29 May 2013 04:16:36 GMT Subject: [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode Message-ID: <1369801000-3705-5-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1369801000-3705-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 76900a0..9b5d78b 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -335,6 +335,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.3.rc3.312.g47657de