diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:50:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:50:03 -0700 |
| commit | e6202dfe0021e2662eb4e19e6d01e33081608b5e (patch) | |
| tree | 24d3b7a2461a8acebf275d54086496786823fe4e /Documentation | |
| parent | 0141215c9b1b95b6b9619358ab13e0f56e1cd01c (diff) | |
| parent | 3a3a29c1da97b36dda2761c2e6b61c1a82e20a54 (diff) | |
| download | git-e6202dfe0021e2662eb4e19e6d01e33081608b5e.tar.gz | |
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')
| -rw-r--r-- | Documentation/git-daemon.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 2f0ddf6fe8..5054f790a1 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>:: |