Make usage documentation for git-am consistent.

PATCH New Brian Hetro 1 participant 1 message Jun 15, 2016

lore

Share & tools

lore

Brian Hetro

author

2016-06-15 22:43 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 git-am.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

git-am.sh +4 -2

index b5ed8ca..6809aa0 100755
@@ -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

Signature · 1 line

1.5.3.rc6.23.g0058-dirty