summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-02 08:45:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-02 08:52:59 (GMT)
commit8273c79ae2e6b782dba3dccb815b386cc83e4294 (patch)
tree7f115e4cf37acda3ef372cec38f1350300779dc5 /Documentation/git-am.txt
parent2beb3cdd18225be657849790ed845c4d367b760a (diff)
downloadgit-8273c79ae2e6b782dba3dccb815b386cc83e4294.zip
git-8273c79ae2e6b782dba3dccb815b386cc83e4294.tar.gz
git-8273c79ae2e6b782dba3dccb815b386cc83e4294.tar.bz2
war on whitespaces: documentation.
We were missing the --whitespace option in the usage string for git-apply and git-am, so this commit adds them. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 02cabc9..910457d 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -9,7 +9,8 @@ git-am - Apply a series of patches in a mailbox
SYNOPSIS
--------
[verse]
-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
+'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=<option>] <mbox>...
'git-am' [--skip | --resolved]
DESCRIPTION
@@ -46,6 +47,10 @@ OPTIONS
Skip the current patch. This is only meaningful when
restarting an aborted patch.
+--whitespace=<option>::
+ This flag is passed to the `git-apply` program that applies
+ the patch.
+
--interactive::
Run interactively, just like git-applymbox.
@@ -80,7 +85,7 @@ names.
SEE ALSO
--------
-gitlink:git-applymbox[1], gitlink:git-applypatch[1].
+gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
Author