[PATCH] Make usage documentation for git-am consistent.
From: Brian Hetro <hidden>
Date: 2016-06-15 22:43:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
The usage information in git-am.sh now matches that of the documentation. Signed-off-by: Brian Hetro <redacted> --- git-am.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index b5ed8ca..6809aa0 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -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
--
1.5.3.rc6.23.g0058-dirty