Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > We are not in am mode. That may make sense, but shouldn't this part be like so from the very beginning? In other words, this looks like an "oops, 1/5 was buggy and this is a hotfix". > > Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> > --- > 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 -- 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