summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-05-19 16:09:06 -0400
committerJunio C Hamano <gitster@pobox.com>2008-05-19 22:47:16 -0700
commite77b0b5d0fdac411607dbae11ccad87dccd332d3 (patch)
tree1139dadf9055ffb7e698257ceae00447166274d7 /git-am.sh
parent74190d2363a1be81b06992bebbff6bd59f943fe7 (diff)
downloadgit-e77b0b5d0fdac411607dbae11ccad87dccd332d3.tar.gz
git-am: fix typo in usage message
Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 851f85eb55..4dce87bdff 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -10,7 +10,7 @@ git-am [options] --skip
--
d,dotest= use <dir> and not .dotest
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)