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 e5af955c6f0c720c2c1eb3edb415830e44ea03ff..4126f0e857bad273d6f44cabe34565de860bd119 100755 (executable)
--- 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