summaryrefslogtreecommitdiff
path: root/t/t0023-crlf-am.sh
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-08-09 01:28:54 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-16 02:32:36 -0700
commitcb3a160d604866331fdb0f5078face4ab2a4b49a (patch)
tree42901bb7d62ba3650a2c3c38013c3896c120f60f /t/t0023-crlf-am.sh
parent2946cccfdf2fba591b6af61ad6e658bb927832af (diff)
downloadgit-cb3a160d604866331fdb0f5078face4ab2a4b49a.tar.gz
git-am: ignore --binary option
The git-apply documentation says that --binary is a historical option. This patch lets git-am ignore --binary and removes advertisements of this option. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0023-crlf-am.sh')
-rwxr-xr-xt/t0023-crlf-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0023-crlf-am.sh b/t/t0023-crlf-am.sh
index 6f8a4347d5..aaed725402 100755
--- a/t/t0023-crlf-am.sh
+++ b/t/t0023-crlf-am.sh
@@ -36,7 +36,7 @@ test_expect_success 'setup' '
test_expect_success 'am' '
- git am --binary -3 <patchfile &&
+ git am -3 <patchfile &&
git diff-files --name-status --exit-code
'