diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-23 16:05:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-23 16:05:46 -0800 |
| commit | 89ba4e7c7f71712133d1d3137f811b99ea43dd31 (patch) | |
| tree | 0a831af2e55f0b533ff80a53972b0b17755e310f /Documentation | |
| parent | Update draft release notes to 1.7.4 (diff) | |
| parent | daemon: opt-out on features that require posix (diff) | |
| download | tgif-89ba4e7c7f71712133d1d3137f811b99ea43dd31.tar.xz | |
Merge branch 'ef/mingw-daemon'
* ef/mingw-daemon:
daemon: opt-out on features that require posix
daemon: make --inetd and --detach incompatible
daemon: use socklen_t
mingw: use poll-emulation from gnulib
mingw: import poll-emulation from gnulib
daemon: get remote host address from root-process
Improve the mingw getaddrinfo stub to handle more use cases
daemon: use full buffered mode for stderr
daemon: use run-command api for async serving
mingw: add kill emulation
mingw: support waitpid with pid > 0 and WNOHANG
mingw: use real pid
inet_ntop: fix a couple of old-style decls
compat: add inet_pton and inet_ntop prototypes
mingw: implement syslog
mingw: add network-wrappers for daemon
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-daemon.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 5054f790a1..d15cb6a845 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -78,7 +78,8 @@ OPTIONS --inetd:: Have the server run as an inetd service. Implies --syslog. - Incompatible with --port, --listen, --user and --group options. + Incompatible with --detach, --port, --listen, --user and --group + options. --listen=<host_or_ipaddr>:: Listen on a specific IP address or hostname. IP addresses can |