X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=4b157fe5d536fdbdbf85e0e06c419b5927a90867;hb=c002922adce90b69ac56a86eeb77b249afa88eb2;hp=aa602618e6caedbfdd2d54ad4bb8375356cc55f6;hpb=614eef259f0e805c7f656e1684b6a7ae56e1ee40;p=git.git

diff --git a/git-am.sh b/git-am.sh
index aa602618e..4b157fe5d 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -247,10 +247,11 @@ else
 		exit 1
 	}
 
-	# -s, -u, -k and --whitespace flags are kept for the
-	# resuming session after a patch failure.
-	# -3 and -i can and must be given when resuming.
-	echo " $ws" >"$dotest/whitespace"
+	# -s, -u, -k, --whitespace, -3, -C and -p flags are kept
+	# for the resuming session after a patch failure.
+	# -i can and must be given when resuming.
+	echo " $git_apply_opt" >"$dotest/apply-opt"
+	echo "$threeway" >"$dotest/threeway"
 	echo "$sign" >"$dotest/sign"
 	echo "$utf8" >"$dotest/utf8"
 	echo "$keep" >"$dotest/keep"
@@ -283,7 +284,11 @@ if test "$(cat "$dotest/keep")" = t
 then
 	keep=-k
 fi
-ws=`cat "$dotest/whitespace"`
+if test "$(cat "$dotest/threeway")" = t
+then
+	threeway=t
+fi
+git_apply_opt=$(cat "$dotest/apply-opt")
 if test "$(cat "$dotest/sign")" = t
 then
 	SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '