development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-am: -i does not take a string parameter.

Browse source 
$ 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>
This commit is contained in:
Junio C Hamano 2007-11-08 23:04:31 -08:00
parent e817e3e857
commit 66006c63e7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-am.sh
View file

@ -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