undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.5.4' into maint

Browse Source 
* maint-1.5.4:
  git-am: fix typo in usage message
  doc/git-daemon: s/uploadarchive/uploadarch/
This commit is contained in:
Junio C Hamano 2008-05-21 14:27:59 -07:00
commit 008442f5e7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-daemon.txt
View File

@ -174,7 +174,7 @@ upload-pack::
upload-archive:: upload-archive::
This serves `git-archive --remote`. It is disabled by This serves `git-archive --remote`. It is disabled by
default, but a repository can enable it by setting default, but a repository can enable it by setting
`daemon.uploadarchive` configuration item to `true`. `daemon.uploadarch` configuration item to `true`.
receive-pack:: receive-pack::
This serves `git-send-pack` clients, allowing anonymous This serves `git-send-pack` clients, allowing anonymous
@ -257,7 +257,7 @@ selectively enable/disable services per repository::
---------------------------------------------------------------- ----------------------------------------------------------------
[daemon] [daemon]
uploadpack = false uploadpack = false
uploadarchive = true uploadarch = true
---------------------------------------------------------------- ----------------------------------------------------------------

2
git-am.sh
View File

@ -11,7 +11,7 @@ git-am [options] --skip
-- --
d,dotest= (removed -- do not use) d,dotest= (removed -- do not use)
i,interactive run interactively 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 3,3way allow fall back on 3way merging if needed
s,signoff add a Signed-off-by line to the commit message s,signoff add a Signed-off-by line to the commit message
u,utf8 recode into utf8 (default) u,utf8 recode into utf8 (default)