Andrew's git / gitweb.git / diff
?
Make usage documentation for git-am consistent.
authorBrian Hetro <whee@smaertness.net>
Sun, 26 Aug 2007 03:19:38 +0000 (23:19 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 26 Aug 2007 05:35:35 +0000 (22:35 -0700)
The usage information in git-am.sh now matches that of the
documentation.

Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh patch | blob | history
diff --git a/git-am.sh b/git-am.sh
index b5ed8ca15c9811ccd87b6d81a82ca301736f0b66..6809aa07f60165855ebc0192750e85569f9685ff 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -2,8 +2,10 @@
 #
 # Copyright (c) 2005, 2006 Junio C Hamano
 
 #
 # Copyright (c) 2005, 2006 Junio C Hamano
 
-USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
-  [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>...
+USAGE='[--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
+  [--3way] [--interactive] [--binary]
+  [--whitespace=<option>] [-C<n>] [-p<n>]
+  <mbox>|<Maildir>...
   or, when resuming [--skip | --resolved]'
 . git-sh-setup
 set_reflog_action am
   or, when resuming [--skip | --resolved]'
 . git-sh-setup
 set_reflog_action am