@matheusbsbs / matheus-bagliano / commits / 1560be16b9
Fork 0

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>

Brian Hetro committed Aug 25, 2007 at 23:19 UTC 1560be16b94a85df166ae26bcfff11bcd57c2fed
1 file changed +4 -2
git-am.sh
+4 -2
@@ -2,8 +2,10 @@
2 #
3 # Copyright (c) 2005, 2006 Junio C Hamano
4
5 -USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
6 - [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>...
5 +USAGE='[--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
6 + [--3way] [--interactive] [--binary]
7 + [--whitespace=<option>] [-C<n>] [-p<n>]
8 + <mbox>|<Maildir>...
9 or, when resuming [--skip | --resolved]'
10 . git-sh-setup
11 set_reflog_action am