X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=b48096ec2037e3f14d4bdf89a0afe4623aff090e;hb=9adefee5b5811c57c30cf81804127b59b235538a;hp=75886a8f2fb0c2244ba921398ae2339dc9ffea26;hpb=30c0312fd182942c10421e77d2b3ec6284cc0468;p=git.git diff --git a/git-am.sh b/git-am.sh index 75886a8f2..b48096ec2 100755 --- a/git-am.sh +++ b/git-am.sh @@ -11,7 +11,7 @@ git-am [options] --skip -- d,dotest= (removed -- do not use) i,interactive run interactively -b,binary pass --allo-binary-replacement to git-apply +b,binary pass --allow-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 u,utf8 recode into utf8 (default)