diff options
author | Brian Hetro <whee@smaertness.net> | 2007-08-26 07:19:38 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-08-26 09:35:35 +0400 |
commit | 1560be16b94a85df166ae26bcfff11bcd57c2fed (patch) | |
tree | ee2c14b1c92a4cd64df7d5e9bc5fe4ebf4aa9fdd | |
parent | 9064d87b06f3d0b4ca0aabb45770eefb84fc3ca2 (diff) |
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>
-rwxr-xr-x | git-am.sh | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |