summaryrefslogtreecommitdiffstats
path: root/git-daemon.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-01-25 02:23:58 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-01-25 02:23:58 +0000
commitfa0d4cf086d6099cc8614d634b0c805a0c0178b5 (patch)
tree38c9d2c98ecd4977af1e796868d89d95bbf94c19 /git-daemon.txt
parentbee172f30c491a85a02c77a27a4bdb83741cd647 (diff)
downloadgit-htmldocs-fa0d4cf086d6099cc8614d634b0c805a0c0178b5.tar.gz
Autogenerated HTML docs for v1.5.0-rc2-g19605
Diffstat (limited to 'git-daemon.txt')
-rw-r--r--git-daemon.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-daemon.txt b/git-daemon.txt
index 993adc7c5..9ddab7120 100644
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -131,14 +131,14 @@ Giving these options is an error when used with `--inetd`; use
the facility of inet daemon to achieve the same before spawning
`git-daemon` if needed.
---enable-service, --disable-service::
+--enable=service, --disable=service::
Enable/disable the service site-wide per default. Note
that a service disabled site-wide can still be enabled
per repository if it is marked overridable and the
repository enables the service with an configuration
item.
---allow-override, --forbid-override::
+--allow-override=service, --forbid-override=service::
Allow/forbid overriding the site-wide default with per
repository configuration. By default, all the services
are overridable.