.\" 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)
.SH "NAME"
git\-cherry \- Find commits not merged upstream
.SH "SYNOPSIS"
-\fIgit\-cherry\fR [\-v] <upstream> [<head>]
+\fIgit\-cherry\fR [\-v] <upstream> [<head>] [<limit>]
.sp
.SH "DESCRIPTION"
The changeset (or "diff") of each commit between the fork\-point and <head> is compared against each commit between the fork\-point and <upstream>.
.sp
-Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the <upstream> branch are prefixed with a minus (\-) sign, and those that only exist in the <head> branch are prefixed with a plus (+) symbol.
+Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the <upstream> branch are prefixed with a minus (\-) sign, and those that only exist in the <head> branch are prefixed with a plus (+) symbol:
.sp
+.sp
+.nf
+ __*__*__*__*__> <upstream>
+ /
+fork\-point
+ \\__+__+__\-__+__+__\-__+__> <head>
+.fi
+If a <limit> has been given then the commits along the <head> branch up to and including <limit> are not reported:
+.sp
+.sp
+.nf
+ __*__*__*__*__> <upstream>
+ /
+fork\-point
+ \\__*__*__<limit>__\-__+__> <head>
+.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 <upstream> under a different commit id. For example, this will happen if you're feeding patches <upstream> via email rather than pushing or pulling commits directly.
.sp
.SH "OPTIONS"
.\" 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)
.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
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
.\" 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)
.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
.\" 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)
.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
.\" 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)
.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
.\" 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)
.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
My Various Git Projects / git.git / commitdiff