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>
Junio C Hamano committed
Nov 8, 2007 at 23:04 UTC
66006c63e7c2470e7365a06ea85a03489769cf62
1 file changed
+1
-1
git-am.sh
+1
-1
@@ -9,7 +9,7 @@ git-am [options] --resolved
9
git-am [options] --skip
10
--
11
d,dotest= use <dir> and not .dotest
12
-i,interactive= run interactively
12
+i,interactive run interactively
13
b,binary pass --allo-binary-replacement to git-apply
14
3,3way allow fall back on 3way merging if needed
15
s,signoff add a Signed-off-by line to the commit message