[PATCH v4 26/45] rebase: cherry-pick: fix abort of cherry mode
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- 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