Skip to content

Commit ff1e8bf

Browse files
committed
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()
2 parents 445cac1 + 460c201 commit ff1e8bf

File tree

2 files changed

+107
-197
lines changed

2 files changed

+107
-197
lines changed

Documentation/git-daemon.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ SYNOPSIS
99
--------
1010
[verse]
1111
'git daemon' [--verbose] [--syslog] [--export-all]
12-
[--timeout=n] [--init-timeout=n] [--strict-paths]
13-
[--base-path=path] [--user-path | --user-path=path]
12+
[--timeout=n] [--init-timeout=n] [--max-connections=n]
13+
[--strict-paths] [--base-path=path] [--base-path-relaxed]
14+
[--user-path | --user-path=path]
1415
[--interpolated-path=pathtemplate]
1516
[--reuseaddr] [--detach] [--pid-file=file]
1617
[--enable=service] [--disable=service]
@@ -99,6 +100,10 @@ OPTIONS
99100
it takes for the server to process the sub-request and time spent
100101
waiting for next client's request.
101102

103+
--max-connections::
104+
Maximum number of concurrent clients, defaults to 32. Set it to
105+
zero for no limit.
106+
102107
--syslog::
103108
Log to syslog instead of stderr. Note that this option does not imply
104109
--verbose, thus by default only error conditions will be logged.

0 commit comments

Comments
 (0)