Skip to content

Commit

Permalink
daemon: documentation for --reuseaddr, --detach and --pid-file
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Lederhofer <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
matled authored and Junio C Hamano committed Jul 27, 2006
1 parent 5209eda commit 6c35119
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 12 additions & 1 deletion Documentation/git-daemon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SYNOPSIS
'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
[--timeout=n] [--init-timeout=n] [--strict-paths]
[--base-path=path] [--user-path | --user-path=path]
[directory...]
[--reuseaddr] [--detach] [--pid-file=file] [directory...]

DESCRIPTION
-----------
Expand Down Expand Up @@ -82,6 +82,17 @@ OPTIONS
--verbose::
Log details about the incoming connections and requested files.

--reuseaddr::
Use SO_REUSEADDR when binding the listening socket.
This allows the server to restart without waiting for
old connections to time out.

--detach::
Detach from the shell. Implies --syslog.

--pid-file=file::
Save the process id in 'file'.

<directory>::
A directory to add to the whitelist of allowed directories. Unless
--strict-paths is specified this will also include subdirectories
Expand Down
2 changes: 1 addition & 1 deletion daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static const char daemon_usage[] =
"git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\n"
" [--timeout=n] [--init-timeout=n] [--strict-paths]\n"
" [--base-path=path] [--user-path | --user-path=path]\n"
" [--reuseaddr] [directory...]";
" [--reuseaddr] [--detach] [--pid-file=file] [directory...]";

/* List of acceptable pathname prefixes */
static char **ok_paths = NULL;
Expand Down

0 comments on commit 6c35119

Please sign in to comment.