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