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>
This commit is contained in:
parent
9064d87b06
commit
1560be16b9
@ -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]
|
USAGE='[--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
|
||||||
[--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>...
|
[--3way] [--interactive] [--binary]
|
||||||
|
[--whitespace=<option>] [-C<n>] [-p<n>]
|
||||||
|
<mbox>|<Maildir>...
|
||||||
or, when resuming [--skip | --resolved]'
|
or, when resuming [--skip | --resolved]'
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
set_reflog_action am
|
set_reflog_action am
|
||||||
|
Loading…
Reference in New Issue
Block a user