.\" 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/03/2006" "" ""
+.TH "GIT\-DAEMON" "1" "10/26/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
git stream tcp nowait nobody /usr/bin/git\-daemon
- git\-daemon \-\-inetd \-\-verbose
- \-\-syslog \-\-export\-all
+ git\-daemon \-\-inetd \-\-verbose \-\-export\-all
/pub/foo /pub/bar
.fi
.TP
.sp
.nf
git stream tcp nowait nobody /usr/bin/git\-daemon
- git\-daemon \-\-inetd \-\-verbose
- \-\-syslog \-\-export\-all
+ git\-daemon \-\-inetd \-\-verbose \-\-export\-all
\-\-interpolated\-path=/pub/%H%D
/pub/www.example.org/software
/pub/www.example.com/software
.\" 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/19/2006" "" ""
+.TH "GIT\-DIFF\-FILES" "1" "10/26/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
diff \-\-combined describe.c
-@@@ +98,7 @@@
- return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
+index fabadb8,cc95eb0..4866510
+\-\-\- a/describe.c
++++ b/describe.c
+@@@ \-98,20 \-98,12 +98,20 @@@
+ return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
}
\- static void describe(char *arg)
\-static void describe(struct commit *cmit, int last_one)
++static void describe(char *arg, int last_one)
{
- + unsigned char sha1[20];
- + struct commit *cmit;
+ + unsigned char sha1[20];
+ + struct commit *cmit;
+ struct commit_list *list;
+ static int initialized = 0;
+ struct commit_name *n;
+
+ + if (get_sha1(arg, sha1) < 0)
+ + usage(describe_usage);
+ + cmit = lookup_commit_reference(sha1);
+ + if (!cmit)
+ + usage(describe_usage);
+ +
+ if (!initialized) {
+ initialized = 1;
+ for_each_ref(get_name);
+.fi
+.TP 3
+1.
+It is preceded with a "git diff" header, that looks like this (when
+\fI\-c\fR
+option is used):
+.sp
+.nf
+diff \-\-combined file
+.fi
+or like this (when
+\fI\-\-cc\fR
+option is used):
+.sp
+.nf
+diff \-\-c file
+.fi
+.TP
+2.
+It is followed by one or more extended header lines (this example shows a merge with two parents):
+.sp
+.nf
+index <hash>,<hash>..<hash>
+mode <mode>,<mode>..<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>
+.fi
+The
+mode <mode>,<mode>..<mode>
+line appears only if at least one of the <mode> is diferent from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format.
+.TP
+3.
+It is followed by two\-line from\-file/to\-file header
+.sp
+.nf
+\-\-\- a/file
++++ b/file
+.fi
+Similar to two\-line header for traditional
+\fIunified\fR
+diff format,
+/dev/null
+is used to signal created or deleted files.
+.TP
+4.
+Chunk header format is modified to prevent people from accidentally feeding it to
+patch \-p1. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended
+\fIindex\fR
+header:
+.sp
+.nf
+@@@ <from\-file\-range> <from\-file\-range> <to\-file\-range> @@@
.fi
-Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
+There are (number of parents + 1)
+@
+characters in the chunk header for combined diff format.
+Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or " " (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
.sp
-A \- character in the column N means that the line appears in fileN but it does not appear in the last file. A + character in the column N means that the line appears in the last file, and fileN does not have that line.
+A \- character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).
.sp
In the above example output, the function signature was changed from both files (hence two \- removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same from file1 but do not appear in file2 (hence prefixed with +).
.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/19/2006" "" ""
+.TH "GIT\-DIFF\-INDEX" "1" "10/26/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
diff \-\-combined describe.c
-@@@ +98,7 @@@
- return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
+index fabadb8,cc95eb0..4866510
+\-\-\- a/describe.c
++++ b/describe.c
+@@@ \-98,20 \-98,12 +98,20 @@@
+ return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
}
\- static void describe(char *arg)
\-static void describe(struct commit *cmit, int last_one)
++static void describe(char *arg, int last_one)
{
- + unsigned char sha1[20];
- + struct commit *cmit;
+ + unsigned char sha1[20];
+ + struct commit *cmit;
+ struct commit_list *list;
+ static int initialized = 0;
+ struct commit_name *n;
+
+ + if (get_sha1(arg, sha1) < 0)
+ + usage(describe_usage);
+ + cmit = lookup_commit_reference(sha1);
+ + if (!cmit)
+ + usage(describe_usage);
+ +
+ if (!initialized) {
+ initialized = 1;
+ for_each_ref(get_name);
+.fi
+.TP 3
+1.
+It is preceded with a "git diff" header, that looks like this (when
+\fI\-c\fR
+option is used):
+.sp
+.nf
+diff \-\-combined file
+.fi
+or like this (when
+\fI\-\-cc\fR
+option is used):
+.sp
+.nf
+diff \-\-c file
+.fi
+.TP
+2.
+It is followed by one or more extended header lines (this example shows a merge with two parents):
+.sp
+.nf
+index <hash>,<hash>..<hash>
+mode <mode>,<mode>..<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>
+.fi
+The
+mode <mode>,<mode>..<mode>
+line appears only if at least one of the <mode> is diferent from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format.
+.TP
+3.
+It is followed by two\-line from\-file/to\-file header
+.sp
+.nf
+\-\-\- a/file
++++ b/file
+.fi
+Similar to two\-line header for traditional
+\fIunified\fR
+diff format,
+/dev/null
+is used to signal created or deleted files.
+.TP
+4.
+Chunk header format is modified to prevent people from accidentally feeding it to
+patch \-p1. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended
+\fIindex\fR
+header:
+.sp
+.nf
+@@@ <from\-file\-range> <from\-file\-range> <to\-file\-range> @@@
.fi
-Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
+There are (number of parents + 1)
+@
+characters in the chunk header for combined diff format.
+Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or " " (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
.sp
-A \- character in the column N means that the line appears in fileN but it does not appear in the last file. A + character in the column N means that the line appears in the last file, and fileN does not have that line.
+A \- character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).
.sp
In the above example output, the function signature was changed from both files (hence two \- removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same from file1 but do not appear in file2 (hence prefixed with +).
.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/19/2006" "" ""
+.TH "GIT\-DIFF\-STAGES" "1" "10/26/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
diff \-\-combined describe.c
-@@@ +98,7 @@@
- return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
+index fabadb8,cc95eb0..4866510
+\-\-\- a/describe.c
++++ b/describe.c
+@@@ \-98,20 \-98,12 +98,20 @@@
+ return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
}
\- static void describe(char *arg)
\-static void describe(struct commit *cmit, int last_one)
++static void describe(char *arg, int last_one)
{
- + unsigned char sha1[20];
- + struct commit *cmit;
+ + unsigned char sha1[20];
+ + struct commit *cmit;
+ struct commit_list *list;
+ static int initialized = 0;
+ struct commit_name *n;
+
+ + if (get_sha1(arg, sha1) < 0)
+ + usage(describe_usage);
+ + cmit = lookup_commit_reference(sha1);
+ + if (!cmit)
+ + usage(describe_usage);
+ +
+ if (!initialized) {
+ initialized = 1;
+ for_each_ref(get_name);
+.fi
+.TP 3
+1.
+It is preceded with a "git diff" header, that looks like this (when
+\fI\-c\fR
+option is used):
+.sp
+.nf
+diff \-\-combined file
+.fi
+or like this (when
+\fI\-\-cc\fR
+option is used):
+.sp
+.nf
+diff \-\-c file
+.fi
+.TP
+2.
+It is followed by one or more extended header lines (this example shows a merge with two parents):
+.sp
+.nf
+index <hash>,<hash>..<hash>
+mode <mode>,<mode>..<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>
+.fi
+The
+mode <mode>,<mode>..<mode>
+line appears only if at least one of the <mode> is diferent from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format.
+.TP
+3.
+It is followed by two\-line from\-file/to\-file header
+.sp
+.nf
+\-\-\- a/file
++++ b/file
+.fi
+Similar to two\-line header for traditional
+\fIunified\fR
+diff format,
+/dev/null
+is used to signal created or deleted files.
+.TP
+4.
+Chunk header format is modified to prevent people from accidentally feeding it to
+patch \-p1. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended
+\fIindex\fR
+header:
+.sp
+.nf
+@@@ <from\-file\-range> <from\-file\-range> <to\-file\-range> @@@
.fi
-Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
+There are (number of parents + 1)
+@
+characters in the chunk header for combined diff format.
+Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or " " (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
.sp
-A \- character in the column N means that the line appears in fileN but it does not appear in the last file. A + character in the column N means that the line appears in the last file, and fileN does not have that line.
+A \- character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).
.sp
In the above example output, the function signature was changed from both files (hence two \- removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same from file1 but do not appear in file2 (hence prefixed with +).
.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/19/2006" "" ""
+.TH "GIT\-DIFF\-TREE" "1" "10/26/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
diff \-\-combined describe.c
-@@@ +98,7 @@@
- return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
+index fabadb8,cc95eb0..4866510
+\-\-\- a/describe.c
++++ b/describe.c
+@@@ \-98,20 \-98,12 +98,20 @@@
+ return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
}
\- static void describe(char *arg)
\-static void describe(struct commit *cmit, int last_one)
++static void describe(char *arg, int last_one)
{
- + unsigned char sha1[20];
- + struct commit *cmit;
+ + unsigned char sha1[20];
+ + struct commit *cmit;
+ struct commit_list *list;
+ static int initialized = 0;
+ struct commit_name *n;
+
+ + if (get_sha1(arg, sha1) < 0)
+ + usage(describe_usage);
+ + cmit = lookup_commit_reference(sha1);
+ + if (!cmit)
+ + usage(describe_usage);
+ +
+ if (!initialized) {
+ initialized = 1;
+ for_each_ref(get_name);
+.fi
+.TP 3
+1.
+It is preceded with a "git diff" header, that looks like this (when
+\fI\-c\fR
+option is used):
+.sp
+.nf
+diff \-\-combined file
+.fi
+or like this (when
+\fI\-\-cc\fR
+option is used):
+.sp
+.nf
+diff \-\-c file
+.fi
+.TP
+2.
+It is followed by one or more extended header lines (this example shows a merge with two parents):
+.sp
+.nf
+index <hash>,<hash>..<hash>
+mode <mode>,<mode>..<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>
+.fi
+The
+mode <mode>,<mode>..<mode>
+line appears only if at least one of the <mode> is diferent from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format.
+.TP
+3.
+It is followed by two\-line from\-file/to\-file header
+.sp
+.nf
+\-\-\- a/file
++++ b/file
+.fi
+Similar to two\-line header for traditional
+\fIunified\fR
+diff format,
+/dev/null
+is used to signal created or deleted files.
+.TP
+4.
+Chunk header format is modified to prevent people from accidentally feeding it to
+patch \-p1. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended
+\fIindex\fR
+header:
+.sp
+.nf
+@@@ <from\-file\-range> <from\-file\-range> <to\-file\-range> @@@
.fi
-Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
+There are (number of parents + 1)
+@
+characters in the chunk header for combined diff format.
+Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or " " (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.
.sp
-A \- character in the column N means that the line appears in fileN but it does not appear in the last file. A + character in the column N means that the line appears in the last file, and fileN does not have that line.
+A \- character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).
.sp
In the above example output, the function signature was changed from both files (hence two \- removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same from file1 but do not appear in file2 (hence prefixed with +).
.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\-REV\-PARSE" "1" "10/19/2006" "" ""
+.TH "GIT\-REV\-PARSE" "1" "10/26/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\(bu
An output from
git\-describe; i.e. a closest tag, followed by a dash, a
-\fIg\fR, and an abbreviated object name.
+g, and an abbreviated object name.
.TP
\(bu
A symbolic ref name. E.g.
\fImaster\fR
typically means the commit object referenced by $GIT_DIR/refs/heads/master. If you happen to have both heads/master and tags/master, you can explicitly say
\fIheads/master\fR
-to tell git which one you mean.
+to tell git which one you mean. When ambiguous, a
+<name>
+is disambiguated by taking the first match in the following rules:
+.RS
+.TP 3
+1.
+if
+$GIT_DIR/<name>
+exists, that is what you mean (this is usually useful only for
+HEAD,
+FETCH_HEAD
+and
+MERGE_HEAD);
+.TP
+2.
+otherwise,
+$GIT_DIR/refs/<name>
+if exists;
+.TP
+3.
+otherwise,
+$GIT_DIR/refs/tags/<name>
+if exists;
+.TP
+4.
+otherwise,
+$GIT_DIR/refs/heads/<name>
+if exists;
+.TP
+5.
+otherwise,
+$GIT_DIR/refs/remotes/<name>
+if exists;
+.TP
+6.
+otherwise,
+$GIT_DIR/refs/remotes/<name>/HEAD
+if exists.
+.RE
.TP
\(bu
-A suffix
+A ref followed by the suffix
\fI@\fR
-followed by a date specification enclosed in a brace pair (e.g.
+with a date specification enclosed in a brace pair (e.g.
\fI{yesterday}\fR,
\fI{1 month 2 weeks 3 days 1 hour 1 second ago}\fR
or
\(bu
A suffix
\fI~<n>\fR
-to a revision parameter means the commit object that is the <n>th generation grand\-parent of the named commit object, following only the first parent. I.e. rev~3 is equivalent to rev^^^ which is equivalent to rev^1^1^1.
+to a revision parameter means the commit object that is the <n>th generation grand\-parent of the named commit object, following only the first parent. I.e. rev~3 is equivalent to rev^^^ which is equivalent to rev^1^1^1. See below for a illustration of the usage of this form.
.TP
\(bu
A suffix
projects / git.git / commitdiff