From 7d5764772168be6d27e7eb72e042e43aefa8145d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 27 Oct 2006 09:29:37 +0000 Subject: [PATCH] Autogenerated man pages for v1.4.3.3-g01929 --- man1/git-cherry.1 | 22 +++++++++++++++++++--- man1/git-daemon.1 | 15 ++++++++++++++- man1/git-diff-files.1 | 10 ++++++---- man1/git-diff-index.1 | 10 ++++++---- man1/git-diff-stages.1 | 10 ++++++---- man1/git-diff-tree.1 | 10 ++++++---- 6 files changed, 57 insertions(+), 20 deletions(-) diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index 96943a3fc..3187bd86c 100755 --- a/man1/git-cherry.1 +++ b/man1/git-cherry.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CHERRY" "1" "10/25/2006" "" "" +.TH "GIT\-CHERRY" "1" "10/27/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,13 +10,29 @@ .SH "NAME" git\-cherry \- Find commits not merged upstream .SH "SYNOPSIS" -\fIgit\-cherry\fR [\-v] [] +\fIgit\-cherry\fR [\-v] [] [] .sp .SH "DESCRIPTION" The changeset (or "diff") of each commit between the fork\-point and is compared against each commit between the fork\-point and . .sp -Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the branch are prefixed with a minus (\-) sign, and those that only exist in the branch are prefixed with a plus (+) symbol. +Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the branch are prefixed with a minus (\-) sign, and those that only exist in the branch are prefixed with a plus (+) symbol: .sp +.sp +.nf + __*__*__*__*__> + / +fork\-point + \\__+__+__\-__+__+__\-__+__> +.fi +If a has been given then the commits along the branch up to and including are not reported: +.sp +.sp +.nf + __*__*__*__*__> + / +fork\-point + \\__*__*____\-__+__> +.fi Because git\-cherry compares the changeset rather than the commit id (sha1), you can use git\-cherry to find out if a commit you made locally has been applied under a different commit id. For example, this will happen if you're feeding patches via email rather than pushing or pulling commits directly. .sp .SH "OPTIONS" diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index aa0605a6a..84836e69c 100755 --- a/man1/git-daemon.1 +++ b/man1/git-daemon.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DAEMON" "1" "10/26/2006" "" "" +.TH "GIT\-DAEMON" "1" "10/27/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -31,6 +31,8 @@ By default, only upload\-pack service is enabled, which serves git\-fetch\-pack .sp This is ideally suited for read\-only updates, i.e., pulling from git repositories. .sp +An upload\-archive also exists to serve git\-archive. +.sp .SH "OPTIONS" .TP \-\-strict\-paths @@ -137,8 +139,19 @@ clients. It is enabled by default, but a repository can disable it by setting daemon.uploadpack configuration item to false. +.TP +upload\-archive +This serves +git\-archive \-\-remote. .SH "EXAMPLES" .TP +We assume the following in /etc/services +.sp +.nf +$ grep 9418 /etc/services +git 9418/tcp # Git Version Control System +.fi +.TP git\-daemon as inetd server To set up git\-daemon diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 9fe826ee3..77cf86a39 100755 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-FILES" "1" "10/26/2006" "" "" +.TH "GIT\-DIFF\-FILES" "1" "10/27/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -330,10 +330,12 @@ index .. .fi .TP 3. -TAB, LF, and backslash characters in pathnames are represented as +TAB, LF, double quote and backslash characters in pathnames are represented as \\t, -\\n, and -\\\\, respectively. +\\n, +\\" +and +\\\\, respectively. If there is need for such substitution then the whole pathname is put in double quotes. .SH "COMBINED DIFF FORMAT" git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index cb043ffd9..0032ec129 100755 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-INDEX" "1" "10/26/2006" "" "" +.TH "GIT\-DIFF\-INDEX" "1" "10/27/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -326,10 +326,12 @@ index .. .fi .TP 3. -TAB, LF, and backslash characters in pathnames are represented as +TAB, LF, double quote and backslash characters in pathnames are represented as \\t, -\\n, and -\\\\, respectively. +\\n, +\\" +and +\\\\, respectively. If there is need for such substitution then the whole pathname is put in double quotes. .SH "COMBINED DIFF FORMAT" git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1 index b1bf08b11..764bfe915 100755 --- a/man1/git-diff-stages.1 +++ b/man1/git-diff-stages.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-STAGES" "1" "10/26/2006" "" "" +.TH "GIT\-DIFF\-STAGES" "1" "10/27/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -320,10 +320,12 @@ index .. .fi .TP 3. -TAB, LF, and backslash characters in pathnames are represented as +TAB, LF, double quote and backslash characters in pathnames are represented as \\t, -\\n, and -\\\\, respectively. +\\n, +\\" +and +\\\\, respectively. If there is need for such substitution then the whole pathname is put in double quotes. .SH "COMBINED DIFF FORMAT" git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index d0aa89e76..9f907a838 100755 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-TREE" "1" "10/26/2006" "" "" +.TH "GIT\-DIFF\-TREE" "1" "10/27/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -432,10 +432,12 @@ index .. .fi .TP 3. -TAB, LF, and backslash characters in pathnames are represented as +TAB, LF, double quote and backslash characters in pathnames are represented as \\t, -\\n, and -\\\\, respectively. +\\n, +\\" +and +\\\\, respectively. If there is need for such substitution then the whole pathname is put in double quotes. .SH "COMBINED DIFF FORMAT" git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp -- 2.26.2