summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-02 00:45:48 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-02 00:52:59 -0800
commit8273c79ae2e6b782dba3dccb815b386cc83e4294 (patch)
tree7f115e4cf37acda3ef372cec38f1350300779dc5 /git-am.sh
parent2beb3cdd18225be657849790ed845c4d367b760a (diff)
downloadgit-8273c79ae2e6b782dba3dccb815b386cc83e4294.tar.gz
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 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index ab133fbd51..eab4aa891e 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -2,7 +2,8 @@
#
# Copyright (c) 2005, 2006 Junio C Hamano
-USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
+USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=<option>] <mbox>...
or, when resuming [--skip | --resolved]'
. git-sh-setup