diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2010-11-04 02:35:23 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-04 16:53:52 -0700 |
| commit | 9cddf56ef13c8575ac0c68d82e6196e5b0a2900d (patch) | |
| tree | 8cc2ad208f4c2bee352f8d3d44a522613a5e0cbe /Documentation/git-daemon.txt | |
| parent | c295cf06608cb07a132abef5802366522fd2f5e0 (diff) | |
| download | git-9cddf56ef13c8575ac0c68d82e6196e5b0a2900d.tar.gz git-9cddf56ef13c8575ac0c68d82e6196e5b0a2900d.tar.xz | |
daemon: make --inetd and --detach incompatible
Since --inetd makes main return with the result of execute() before
daemonize is gets called, these two options are already incompatible.
Document it, and add an error if attempted.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-daemon.txt')
| -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 5054f790a..d15cb6a84 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 |