diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-30 15:17:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 15:17:15 (GMT) |
| commit | ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123 (patch) | |
| tree | 95e28955ef75c5ef26e7575a515df44a139738f0 /Documentation | |
| parent | 445cac18c015809a7fcb4a570d3c6571b1ddaf7d (diff) | |
| parent | 460c201039471d22194ca871290c098bfe6ce6a3 (diff) | |
| download | git-ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123.zip git-ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123.tar.gz git-ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123.tar.bz2 | |
Merge branch 'sb/daemon'
* sb/daemon:
daemon.c: minor style fixup
git-daemon: rewrite kindergarden, new option --max-connections
git-daemon: Simplify dead-children reaping logic
git-daemon: use LOG_PID, simplify logging code
git-daemon: call logerror() instead of error()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-daemon.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 4ba4b75..b08a08c 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -9,8 +9,9 @@ SYNOPSIS -------- [verse] 'git daemon' [--verbose] [--syslog] [--export-all] - [--timeout=n] [--init-timeout=n] [--strict-paths] - [--base-path=path] [--user-path | --user-path=path] + [--timeout=n] [--init-timeout=n] [--max-connections=n] + [--strict-paths] [--base-path=path] [--base-path-relaxed] + [--user-path | --user-path=path] [--interpolated-path=pathtemplate] [--reuseaddr] [--detach] [--pid-file=file] [--enable=service] [--disable=service] @@ -99,6 +100,10 @@ OPTIONS it takes for the server to process the sub-request and time spent waiting for next client's request. +--max-connections:: + Maximum number of concurrent clients, defaults to 32. Set it to + zero for no limit. + --syslog:: Log to syslog instead of stderr. Note that this option does not imply --verbose, thus by default only error conditions will be logged. |