summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 18:43:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-10 22:08:10 (GMT)
commitc5e610be5049f04b3ab8370bb8d1649347d2db87 (patch)
treea8ee6bfb10db3fd6218f0787590dabcdf2e90b88 /git-rebase--am.sh
parentb325680930c007f87d35fdc60566b3441fedc7c3 (diff)
downloadgit-c5e610be5049f04b3ab8370bb8d1649347d2db87.zip
git-c5e610be5049f04b3ab8370bb8d1649347d2db87.tar.gz
git-c5e610be5049f04b3ab8370bb8d1649347d2db87.tar.bz2
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>
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh4
1 files changed, 2 insertions, 2 deletions
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
;;