[PATCH v4 25/45] rebase: cherry-pick: fix sequence continuation
flat view
STALE3767d
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v4 of 3 in this series.
Revisions (3)
- v4 current
- v5 [diff vs current]
- v6 [diff vs current]
We are not in am mode. Signed-off-by: Felipe Contreras <redacted> --- git-rebase--cherrypick.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index e142cfb..d8d32fe 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase--cherrypick.sh@@ -5,12 +5,12 @@ case "$action" in continue) - git am --resolved --resolvemsg="$resolvemsg" && + git cherry-pick --continue && move_to_original_branch return ;; skip) - git am --skip --resolvemsg="$resolvemsg" && + git cherry-pick --skip && move_to_original_branch return ;;
--
1.8.3.698.g079b096