From 9adfc6a1edab792a2e46eaaa78a6f7863c855e18 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 28 Aug 2006 07:18:38 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.2-g370e --- git-apply.html | 6 +++--- git-apply.txt | 4 ++-- git-daemon.html | 20 ++++++++++++++++++-- git-daemon.txt | 14 +++++++++++++- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/git-apply.html b/git-apply.html index 077a8673b..733a07544 100644 --- a/git-apply.html +++ b/git-apply.html @@ -389,8 +389,8 @@ and a work tree.

For atomicity, git-apply(1) by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply - the parts of the patch that are applicable, and send the - rejected hunks to the standard output of the command. + the parts of the patch that are applicable, and leave the + rejected hunks in corresponding *.rej files.

@@ -573,7 +573,7 @@ apply.whitespace diff --git a/git-apply.txt b/git-apply.txt index 20e12ceda..c76cfffdc 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -75,8 +75,8 @@ OPTIONS For atomicity, gitlink:git-apply[1] by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply - the parts of the patch that are applicable, and send the - rejected hunks to the standard output of the command. + the parts of the patch that are applicable, and leave the + rejected hunks in corresponding *.rej files. -z:: When showing the index information, do not munge paths, diff --git a/git-daemon.html b/git-daemon.html index e500baec9..1fd9609d1 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -276,7 +276,8 @@ git-daemon(1) Manual Page
git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all] [--timeout=n] [--init-timeout=n] [--strict-paths] [--base-path=path] [--user-path | --user-path=path] - [--reuseaddr] [--detach] [--pid-file=file] [directory…]
+ [--reuseaddr] [--detach] [--pid-file=file] + [--user=user [--group=group]] [directory…]

DESCRIPTION

@@ -422,6 +423,21 @@ the offers to a whitelist comprising of those.

+--user=user, --group=group +
+
+

+ Change daemon's uid and gid before entering the service loop. + When only --user is given without --group, the + primary group ID for the user is used. The values of + the option are given to getpwnam(3) and getgrnam(3) + and numeric IDs are not supported. +

+

Giving these options is an error when used with --inetd; use +the facility of inet daemon to achieve the same before spawning +git-daemon if needed.

+
+
<directory>
@@ -448,7 +464,7 @@ the offers to a whitelist comprising of those.

diff --git a/git-daemon.txt b/git-daemon.txt index 0f7d274ea..17619a3f5 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -11,7 +11,8 @@ 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] - [--reuseaddr] [--detach] [--pid-file=file] [directory...] + [--reuseaddr] [--detach] [--pid-file=file] + [--user=user [--group=group]] [directory...] DESCRIPTION ----------- @@ -93,6 +94,17 @@ OPTIONS --pid-file=file:: Save the process id in 'file'. +--user=user, --group=group:: + Change daemon's uid and gid before entering the service loop. + When only `--user` is given without `--group`, the + primary group ID for the user is used. The values of + the option are given to `getpwnam(3)` and `getgrnam(3)` + and numeric IDs are not supported. ++ +Giving these options is an error when used with `--inetd`; use +the facility of inet daemon to achieve the same before spawning +`git-daemon` if needed. + :: A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories -- 2.26.2