From: Junio C Hamano Date: Thu, 4 Dec 2008 23:38:27 +0000 (-0800) Subject: git-am: propagate --3way options as well X-Git-Tag: v1.6.1-rc2~5^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=22db240dd1791b32e7f6d25a466c2835bdccb51e;p=git.git git-am: propagate --3way options as well The reasoning is the same as the previous patch, where we made -C and -p propagate across a failure. Signed-off-by: Junio C Hamano --- diff --git a/git-am.sh b/git-am.sh index ed54e716d..13c02d6ad 100755 --- a/git-am.sh +++ b/git-am.sh @@ -247,10 +247,11 @@ else exit 1 } - # -s, -u, -k, --whitespace, -C and -p flags are kept + # -s, -u, -k, --whitespace, -3, -C and -p flags are kept # for the resuming session after a patch failure. - # -3 and -i can and must be given when resuming. + # -i can and must be given when resuming. echo " $git_apply_opt" >"$dotest/apply_opt_extra" + echo "$threeway" >"$dotest/threeway" echo "$sign" >"$dotest/sign" echo "$utf8" >"$dotest/utf8" echo "$keep" >"$dotest/keep" @@ -283,6 +284,10 @@ if test "$(cat "$dotest/keep")" = t then keep=-k fi +if test "$(cat "$dotest/threeway")" = t +then + threeway=t +fi git_apply_opt=$(cat "$dotest/apply_opt_extra") if test "$(cat "$dotest/sign")" = t then