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>
Martin von Zweigbergk committed
Feb 6, 2011 at 13:43 UTC
c5e610be5049f04b3ab8370bb8d1649347d2db87
1 file changed
+2
-2
git-rebase--am.sh
+2
-2
@@ -7,12 +7,12 @@
7
8
case "$action" in
9
continue)
10
- git am --resolved --3way --resolvemsg="$resolvemsg" &&
10
+ git am --resolved --resolvemsg="$resolvemsg" &&
11
move_to_original_branch
12
exit
13
;;
14
skip)
15
- git am --skip -3 --resolvemsg="$resolvemsg" &&
15
+ git am --skip --resolvemsg="$resolvemsg" &&
16
move_to_original_branch
17
exit
18
;;