git-am: fix type in its usage string

Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jörg Sommer 2008-02-03 00:58:06 +01:00 committed by Junio C Hamano
parent 8a2f87332b
commit fe1fa946f5

View File

@ -14,7 +14,7 @@ b,binary pass --allo-binary-replacement to git-apply
3,3way allow fall back on 3way merging if needed 3,3way allow fall back on 3way merging if needed
s,signoff add a Signed-off-by line to the commit message s,signoff add a Signed-off-by line to the commit message
u,utf8 recode into utf8 (default) 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 whitespace= pass it through git-apply
C= pass it through git-apply C= pass it through git-apply
p= pass it through git-apply p= pass it through git-apply