summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-06 22:39:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-06 22:39:16 (GMT)
commitc2e585f530e6339ff3eab0405de6286b7f929b28 (patch)
treeeb9f004809781e3deb5b2af216541bf4486bf729
parent05f5ba6b5d20da55d8bac416eec1ff01adecc5c3 (diff)
parentc6056fbc614100f971d01bbff5dc4a7e8eaa9bcb (diff)
downloadgit-c2e585f530e6339ff3eab0405de6286b7f929b28.zip
git-c2e585f530e6339ff3eab0405de6286b7f929b28.tar.gz
git-c2e585f530e6339ff3eab0405de6286b7f929b28.tar.bz2
Merge branch 'ms/daemon-doc-typo' into maint
* ms/daemon-doc-typo: Documentation/git-daemon: add missing word
-rw-r--r--Documentation/git-daemon.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 31b28fc..e8f7577 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -204,7 +204,7 @@ receive-pack::
can push anything into the repository, including removal
of refs). This is solely meant for a closed LAN setting
where everybody is friendly. This service can be
- enabled by `daemon.receivepack` configuration item to
+ enabled by setting `daemon.receivepack` configuration item to
`true`.
EXAMPLES