From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 28 Aug 2006 07:18:43 +0000 (+0000)
Subject: Autogenerated man pages for v1.4.2-g370e
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=736f3834cb9bbdddd7ac0ecface60d5962ed74af;p=git.git

Autogenerated man pages for v1.4.2-g370e
---

diff --git a/man1/git-apply.1 b/man1/git-apply.1
index b8e9b55e3..d3288b8ce 100755
--- a/man1/git-apply.1
+++ b/man1/git-apply.1
@@ -75,7 +75,7 @@ Apply the patch in reverse\&.
 
 .TP
 \-\-reject
-For atomicity, \fBgit\-apply\fR(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\&.
+For atomicity, \fBgit\-apply\fR(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 leave the rejected hunks in corresponding *\&.rej files\&.
 
 .TP
 \-z
diff --git a/man1/git-daemon.1 b/man1/git-daemon.1
index 98249c888..740a1dd86 100755
--- a/man1/git-daemon.1
+++ b/man1/git-daemon.1
@@ -26,7 +26,8 @@ git-daemon \- A really simple server for git repositories
 \fIgit\-daemon\fR [\-\-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...]
 .fi
 
 .SH "DESCRIPTION"
@@ -97,6 +98,12 @@ Detach from the shell\&. Implies \-\-syslog\&.
 \-\-pid\-file=file
 Save the process id in \fIfile\fR\&.
 
+.TP
+\-\-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\&.
+
 .TP
 <directory>
 A directory to add to the whitelist of allowed directories\&. Unless \-\-strict\-paths is specified this will also include subdirectories of each named directory\&.