summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Sommer <joerg@alea.gnuu.de>2008-02-02 23:58:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-04 00:01:27 (GMT)
commitfe1fa946f5ecc404100fc7dd8df2efc36036e5cc (patch)
tree3ba4486bae2c5e9edc95b394d165d820248f9ec8
parent8a2f87332b847edc7f8fc5f305889c863651ecb5 (diff)
downloadgit-fe1fa946f5ecc404100fc7dd8df2efc36036e5cc.zip
git-fe1fa946f5ecc404100fc7dd8df2efc36036e5cc.tar.gz
git-fe1fa946f5ecc404100fc7dd8df2efc36036e5cc.tar.bz2
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>
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 5f0f241..2ecebc4 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