[PATCH v6 15/28] rebase: cherry-pick: fix sequence continuation

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

Aug 30, 2013, 05:56 UTC

Message-ID

<1377842182-18724-16-git-send-email-felipe.contreras@gmail.com>

In-Reply-To

<1377842182-18724-1-git-send-email-felipe.contreras@gmail.com>

We are not in am mode.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 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.4-fc