We are not in am mode. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- git-rebase--cherrypick.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index 51354af..2fa4993 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase--cherrypick.sh @@ -5,13 +5,15 @@ case "$action" in continue) - git am --resolved --resolvemsg="$resolvemsg" && - move_to_original_branch + git cherry-pick --continue && + move_to_original_branch && + rm -rf "$state_dir" exit ;; skip) - git am --skip --resolvemsg="$resolvemsg" && - move_to_original_branch + git cherry-pick --skip && + move_to_original_branch && + rm -rf "$state_dir" exit ;; esac -- 1.8.3.rc3.312.g47657de -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html