X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=git-am.sh;h=2ecebc45a93784f1ca377941cd9b96569b3ade1c;hb=ecb879f8772d5970bf1eb3677f9c9ebdd6e116a1;hp=5f0f241ad0bb53960d5969df5445760633f87dbc;hpb=e708af6e587ae0ecb2a6480e3614c5ec4a164106;p=git.git diff --git a/git-am.sh b/git-am.sh index 5f0f241ad..2ecebc45a 100755 --- a/git-am.sh +++ b/git-am.sh @@ -14,7 +14,7 @@ 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 u,utf8 recode into utf8 (default) -k,keep pass -k flagg to git-mailinfo +k,keep pass -k flag to git-mailinfo whitespace= pass it through git-apply C= pass it through git-apply p= pass it through git-apply