X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-daemon.txt;h=3783858302018bf9d5afa4336a9fea95b3120167;hb=27dedf0c3b78d1072fb5449149421284f9e5297b;hp=a013a58a7fea696c9c881d9195cf6e652a7f31b0;hpb=2b2dabc29f53c5835868029585000ee487cf6cbb;p=git.git

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index a013a58a..37838583 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -7,7 +7,8 @@ git-daemon - A really simple server for git repositories.
 
 SYNOPSIS
 --------
-'git-daemon' [--verbose] [--syslog] [--inetd | --port=n]
+'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
+             [--timeout=n] [--init-timeout=n] [directory...]
 
 DESCRIPTION
 -----------
@@ -20,18 +21,35 @@ what directory to upload, and it verifies that the directory is ok.
 
 It verifies that the directory has the magic file "git-daemon-export-ok", and
 it will refuse to export any git directory that hasn't explicitly been marked
-for export this way.
+for export this way (unless the '--export-all' parameter is specified). If you
+pass some directory paths as 'git-daemon' arguments, you can further restrict
+the offers to a whitelist comprising of those.
 
 This is ideally suited for read-only updates, ie pulling from git repositories.
 
 OPTIONS
 -------
+--export-all::
+	Allow pulling from all directories that look like GIT repositories
+	(have the 'objects' subdirectory and a 'HEAD' file), even if they
+	do not have the 'git-daemon-export-ok' file.
+
 --inetd::
-	Have the server run as an inetd service.
+	Have the server run as an inetd service. Implies --syslog.
 
 --port::
 	Listen on an alternative port.
 
+--init-timeout::
+	Timeout 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::
+	Timeout for specific client sub-requests. This includes the time
+	it takes for the server to process the sub-request and time spent
+	waiting for next client's request.
+
 --syslog::
 	Log to syslog instead of stderr. Note that this option does not imply
 	--verbose, thus by default only error conditions will be logged.