From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Nov 2007 07:04:31 +0000 (-0800)
Subject: git-am: -i does not take a string parameter.
X-Git-Tag: v1.5.4-rc0~190^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=66006c63e7c2470e7365a06ea85a03489769cf62;p=git.git

git-am: -i does not take a string parameter.

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

diff --git a/git-am.sh b/git-am.sh
index e5af955c6..4126f0e85 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