From: Felipe Contreras Date: Tue, 28 May 2013 13:29:15 GMT Subject: [PATCH 3/5] rebase: fix sequence continuation Message-ID: <1369747757-10192-4-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1369747757-10192-1-git-send-email-felipe.contreras@gmail.com> We are not in am mode. Signed-off-by: Felipe Contreras --- git-rebase--cherry.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh index ab1f8b7..ca78b1b 100644 --- a/git-rebase--cherry.sh +++ b/git-rebase--cherry.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