From: Jörg Sommer Date: Sat, 2 Feb 2008 23:58:06 +0000 (+0100) Subject: git-am: fix type in its usage string X-Git-Tag: v1.5.4.1~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fe1fa946f5ecc404100fc7dd8df2efc36036e5cc;p=git.git git-am: fix type in its usage string Signed-off-by: Jörg Sommer Signed-off-by: Junio C Hamano --- 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