diff options
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 7 |
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 |