aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
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 /Documentation/git-am.txt
parent2946cccfdf2fba591b6af61ad6e658bb927832af (diff)
downloadgit-cb3a160d604866331fdb0f5078face4ab2a4b49a.tar.gz
git-cb3a160d604866331fdb0f5078face4ab2a4b49a.tar.xz
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 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt7
1 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index c45c53ec2..b9c6fac74 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
- [--3way] [--interactive] [--binary]
+ [--3way] [--interactive]
[--whitespace=<option>] [-C<n>] [-p<n>]
[<mbox> | <Maildir>...]
'git am' (--skip | --resolved | --abort)
@@ -59,11 +59,6 @@ default. You could use `--no-utf8` to override this.
it is supposed to apply to, and we have those blobs
available locally.
--b::
---binary::
- Pass `--allow-binary-replacement` flag to 'git-apply'
- (see linkgit:git-apply[1]).
-
--whitespace=<option>::
This flag is passed to the 'git-apply' (see linkgit:git-apply[1])
program that applies