diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:17:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:17:58 -0700 |
| commit | c33e30675b601d6707dc4022a8f64812509c7566 (patch) | |
| tree | a539d5437adf7045d18727ce104bef28b639ec72 | |
| parent | b43b8a20d33f6b19b088b505537133fc898048f6 (diff) | |
| parent | b8843efc062cd9e0a994943f6fc86182e4ebb0ec (diff) | |
| download | git-c33e30675b601d6707dc4022a8f64812509c7566.tar.gz | |
Merge branch 'ms/daemon-timeout-is-in-seconds'
* ms/daemon-timeout-is-in-seconds:
git-daemon.txt: specify --timeout in seconds
| -rw-r--r-- | Documentation/git-daemon.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index ebd13be72e..69a1e4af9e 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -93,14 +93,14 @@ OPTIONS Listen on an alternative port. Incompatible with '--inetd' option. --init-timeout=<n>:: - Timeout between the moment the connection is established and the - client request is received (typically a rather low value, since + Timeout (in seconds) between the moment the connection is established + and the client request is received (typically a rather low value, since that should be basically immediate). --timeout=<n>:: - Timeout for specific client sub-requests. This includes the time - it takes for the server to process the sub-request and the time spent - waiting for the next client's request. + Timeout (in seconds) for specific client sub-requests. This includes + the time it takes for the server to process the sub-request and the + time spent waiting for the next client's request. --max-connections=<n>:: Maximum number of concurrent clients, defaults to 32. Set it to |