X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=1c13b1399185506dd11750fe7e8c1b989a0f3d0c;hb=5a6a9394814273e88124a5576c0be6d37a1262cc;hp=9042432e23d7e43edafce28b6822a041028b57b7;hpb=79eec363d2f7f77cde3a3f25765e8a72b80f288c;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 9042432e2..1c13b1399 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -530,7 +530,6 @@ else
 	echo "$sign" >"$dotest/sign"
 	echo "$utf8" >"$dotest/utf8"
 	echo "$keep" >"$dotest/keep"
-	echo "$keepcr" >"$dotest/keepcr"
 	echo "$scissors" >"$dotest/scissors"
 	echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
 	echo "$GIT_QUIET" >"$dotest/quiet"
@@ -576,12 +575,6 @@ if test "$(cat "$dotest/keep")" = t
 then
 	keep=-k
 fi
-case "$(cat "$dotest/keepcr")" in
-t)
-	keepcr=--keep-cr ;;
-f)
-	keepcr=--no-keep-cr ;;
-esac
 case "$(cat "$dotest/scissors")" in
 t)
 	scissors=--scissors ;;