From: Martin von Zweigbergk Date: Sun, 06 Feb 2011 18:43:58 GMT Subject: [PATCH v2 29/31] git-rebase--am: remove unnecessary --3way option Message-ID: <1297017841-20678-30-git-send-email-martin.von.zweigbergk@gmail.com> In-Reply-To: <1297017841-20678-1-git-send-email-martin.von.zweigbergk@gmail.com> 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 --- git-rebase--am.sh | 4 ++-- 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 ;; -- 1.7.4.rc2.33.g8a14f