git-rebase--am: remove unnecessary --3way option
Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index c9604a6..c815a24 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -7,12 +7,12 @@
case "$action" in
continue)
- git am --resolved --3way --resolvemsg="$resolvemsg" &&
+ git am --resolved --resolvemsg="$resolvemsg" &&
move_to_original_branch
exit
;;
skip)
- git am --skip -3 --resolvemsg="$resolvemsg" &&
+ git am --skip --resolvemsg="$resolvemsg" &&
move_to_original_branch
exit
;;
