summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-08 23:04:31 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-08 23:11:10 -0800
commit66006c63e7c2470e7365a06ea85a03489769cf62 (patch)
tree57dd9911758338c1f2a0a668bb598268c1a61969 /git-am.sh
parente817e3e8579742312534f20c0946cd3c562cfa7c (diff)
downloadgit-66006c63e7c2470e7365a06ea85a03489769cf62.tar.gz
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index e5af955c6f..4126f0e857 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