summaryrefslogtreecommitdiff
path: root/Documentation/git-daemon.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-27 04:50:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-27 04:50:03 (GMT)
commite6202dfe0021e2662eb4e19e6d01e33081608b5e (patch)
tree24d3b7a2461a8acebf275d54086496786823fe4e /Documentation/git-daemon.txt
parent0141215c9b1b95b6b9619358ab13e0f56e1cd01c (diff)
parent3a3a29c1da97b36dda2761c2e6b61c1a82e20a54 (diff)
downloadgit-e6202dfe0021e2662eb4e19e6d01e33081608b5e.zip
git-e6202dfe0021e2662eb4e19e6d01e33081608b5e.tar.gz
git-e6202dfe0021e2662eb4e19e6d01e33081608b5e.tar.bz2
Merge branch 'as/daemon-multi-listen'
* as/daemon-multi-listen: daemon: allow more than one host address given via --listen daemon: add helper function named_sock_setup
Diffstat (limited to 'Documentation/git-daemon.txt')
-rw-r--r--Documentation/git-daemon.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 2f0ddf6..5054f79 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -85,6 +85,7 @@ OPTIONS
be either an IPv4 address or an IPv6 address if supported. If IPv6
is not supported, then --listen=hostname is also not supported and
--listen must be given an IPv4 address.
+ Can be given more than once.
Incompatible with '--inetd' option.
--port=<n>::