From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 May 2008 21:27:59 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=008442f5e798e511cc0cd5d9443552b0d107d558;p=git.git

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/
---

008442f5e798e511cc0cd5d9443552b0d107d558
diff --cc git-am.sh
index 75886a8f2,4dce87bdf..b48096ec2
--- a/git-am.sh
+++ b/git-am.sh
@@@ -9,9 -8,9 +9,9 @@@ git-am [options] <mbox>|<Maildir>..
  git-am [options] --resolved
  git-am [options] --skip
  --
 -d,dotest=       use <dir> and not .dotest
 +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)