* [PATCH] git-am: -i does not take a string parameter.
@ 2007-11-09 7:12 Junio C Hamano
0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2007-11-09 7:12 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git
$ git am -3 -s -i file
spewed the usage strings back at the user while
$ git am -3 -i -s file
didn't. This fixes it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
git-am.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index e5af955..4126f0e 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -9,7 +9,7 @@ git-am [options] --resolved
git-am [options] --skip
--
d,dotest= use <dir> and not .dotest
-i,interactive= run interactively
+i,interactive run interactively
b,binary pass --allo-binary-replacement to git-apply
3,3way allow fall back on 3way merging if needed
s,signoff add a Signed-off-by line to the commit message
--
1.5.3.5.1624.gc2f3b4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-09 7:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-09 7:12 [PATCH] git-am: -i does not take a string parameter Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).