summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-09 13:33:39 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-09 13:33:39 -0800
commit10dd3b2bf1444695416c0dac951297acf7d4e5e4 (patch)
treedfee18f87e5a8e382503931719b285d8a7a226ef /git-am.sh
parentb1af9630d758e1728fc0008b3f18d90d8f87f4c5 (diff)
parent791970425431878c8abe71645a03f0f64e20e461 (diff)
downloadgit-10dd3b2bf1444695416c0dac951297acf7d4e5e4.tar.gz
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: am: don't persist keepcr flag mingw: give waitpid the correct signature git symbolic-ref: documentation fix
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/git-am.sh b/git-am.sh
index 9042432e23..1c13b13991 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 ;;