kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Brian Hetro 2007-08-25 23:19:38 -04:00 committed by Junio C Hamano
parent 9064d87b06
commit 1560be16b9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-am.sh
View File

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