From 66006c63e7c2470e7365a06ea85a03489769cf62 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 8 Nov 2007 23:04:31 -0800 Subject: [PATCH] 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 --- git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 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 -- 2.30.2