summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-08-30 13:30:51 +0200
committerJunio C Hamano <gitster@pobox.com>2010-09-28 11:05:35 -0700
commit3a3a29c1da97b36dda2761c2e6b61c1a82e20a54 (patch)
tree73d9d0d387c78607b4e2decfcc22a6554939895b /Documentation
parent2caa321503cbb6dfd3867d5befe615ae541a77b3 (diff)
downloadgit-3a3a29c1da97b36dda2761c2e6b61c1a82e20a54.tar.gz
daemon: allow more than one host address given via --listen
When the host has more than one interfaces, daemon can listen to all of them by not giving any --listen option, or listen to only one. Teach it to accept more than one --listen options. Remove the hostname information form the die, if no socket could be created. It would only trigger when no interface out of either all interface or the ones specified on the command line with --listen options, can be listened to and so the user does know which "host" was asked. Signed-off-by: Alexander Sulfrian <alexander@sulfrian.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-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 01c9f8eb9e..685aa58cec 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::