From: Brian Hetro <whee@smaertness.net>
Date: Sun, 26 Aug 2007 03:19:38 +0000 (-0400)
Subject: Make usage documentation for git-am consistent.
X-Git-Tag: v1.5.3-rc7~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1560be16b94a85df166ae26bcfff11bcd57c2fed;p=git.git

Make usage documentation for git-am consistent.

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>
---

diff --git a/git-am.sh b/git-am.sh
index b5ed8ca15..6809aa07f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -2,8 +2,10 @@
 #
 # 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