X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=94f853fbd4228cfc298b3a47c6b4a2515f825ac5;hb=afb6b561e3dad13df5d9df9731751a3d310c0854;hp=016b5056eb29fb24d06667c340ad372ed096d4dc;hpb=7fa6c90c72fb8dc8277d7cae759d5036046a5164;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 016b5056e..94f853fbd 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -496,7 +496,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"
@@ -542,12 +541,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 ;;