[PATCH] git-am: -i does not take a string parameter.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
$ 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 <redacted>
---
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