Skip to content

Commit 1560be1

Browse files
wheegitster
authored andcommitted
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]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9064d87 commit 1560be1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

git-am.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
#
33
# Copyright (c) 2005, 2006 Junio C Hamano
44

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>...
79
or, when resuming [--skip | --resolved]'
810
. git-sh-setup
911
set_reflog_action am

0 commit comments

Comments
 (0)