diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:27:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:27:59 -0700 |
| commit | 008442f5e798e511cc0cd5d9443552b0d107d558 (patch) | |
| tree | e390298df6995f791998f08b2a269b8f61389d45 | |
| parent | e4d594c6bdcb25b996120fe21c901af7a08a7f6d (diff) | |
| parent | e77b0b5d0fdac411607dbae11ccad87dccd332d3 (diff) | |
| download | git-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/
| -rw-r--r-- | Documentation/git-daemon.txt | 4 | ||||
| -rwxr-xr-x | git-am.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index fd83bc783..cf261dd40 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -174,7 +174,7 @@ upload-pack:: upload-archive:: This serves `git-archive --remote`. It is disabled by default, but a repository can enable it by setting - `daemon.uploadarchive` configuration item to `true`. + `daemon.uploadarch` configuration item to `true`. receive-pack:: This serves `git-send-pack` clients, allowing anonymous @@ -257,7 +257,7 @@ selectively enable/disable services per repository:: ---------------------------------------------------------------- [daemon] uploadpack = false - uploadarchive = true + uploadarch = true ---------------------------------------------------------------- @@ -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) |