From: Felipe Contreras Date: Sun, 09 Jun 2013 16:40:38 GMT Subject: [PATCH v4 26/45] rebase: cherry-pick: fix abort of cherry mode Message-ID: <1370796057-25312-27-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1370796057-25312-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 4465daf..0937e2c 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -369,6 +369,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.698.g079b096