We are not in am mode.
Signed-off-by: Felipe Contreras <[email protected]>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
