From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Oct 2010 04:50:03 +0000 (-0700)
Subject: Merge branch 'as/daemon-multi-listen'
X-Git-Tag: v1.7.4-rc0~165
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6202dfe0021e2662eb4e19e6d01e33081608b5e;p=git.git

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
---

e6202dfe0021e2662eb4e19e6d01e33081608b5e
diff --cc Documentation/git-daemon.txt
index 2f0ddf6fe,685aa58ce..5054f790a
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@@ -85,12 -85,13 +85,13 @@@ OPTION
  	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::
 +--port=<n>::
  	Listen on an alternative port.  Incompatible with '--inetd' option.
  
 ---init-timeout=n::
 +--init-timeout=<n>::
  	Timeout between the moment the connection is established and the
  	client request is received (typically a rather low value, since
  	that should be basically immediate).