aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-21 14:27:59 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-21 14:27:59 -0700
commit008442f5e798e511cc0cd5d9443552b0d107d558 (patch)
treee390298df6995f791998f08b2a269b8f61389d45 /git-am.sh
parente4d594c6bdcb25b996120fe21c901af7a08a7f6d (diff)
parente77b0b5d0fdac411607dbae11ccad87dccd332d3 (diff)
downloadgit-008442f5e798e511cc0cd5d9443552b0d107d558.tar.gz
git-008442f5e798e511cc0cd5d9443552b0d107d558.tar.xz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/
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 75886a8f2..b48096ec2 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -11,7 +11,7 @@ git-am [options] --skip
--
d,dotest= (removed -- do not use)
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)