[PATCH v6 16/28] rebase: cherry-pick: fix abort of cherry mode
- From
- Felipe Contreras <hidden>
- Date
- 2016-06-15 22:58:34
- Reply to
- Felipe Contreras, 2016-06-15
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 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