summaryrefslogtreecommitdiffstats
path: root/man1/git-diff-tree.1
diff options
context:
space:
mode:
Diffstat (limited to 'man1/git-diff-tree.1')
-rw-r--r--man1/git-diff-tree.144
1 files changed, 22 insertions, 22 deletions
diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 7ffbb71f7..69e42ab53 100644
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -2,12 +2,12 @@
.\" Title: git-diff-tree
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2023-10-20
+.\" Date: 2023-10-23
.\" Manual: Git Manual
-.\" Source: Git 2.42.0.424.gceadf0f3cf
+.\" Source: Git 2.42.0.482.g2e8e77cbac
.\" Language: English
.\"
-.TH "GIT\-DIFF\-TREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual"
+.TH "GIT\-DIFF\-TREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -39,7 +39,7 @@ git-diff-tree \- Compares the content and mode of blobs found via two tree objec
.sp
.SH "DESCRIPTION"
.sp
-Compares the content and mode of the blobs found via two tree objects\&.
+Compare the content and mode of blobs found via two tree objects\&.
.sp
If there is only one <tree\-ish> given, the commit is compared with its parents (see \-\-stdin below)\&.
.sp
@@ -803,7 +803,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with
.RS 4
Discard the files before the named <file> from the output (i\&.e\&.
\fIskip to\fR), or move them to the end of the output (i\&.e\&.
-\fIrotate to\fR)\&. These were invented primarily for use of the
+\fIrotate to\fR)\&. These options were invented primarily for the use of the
\fBgit difftool\fR
command, and may not be very useful otherwise\&.
.RE
@@ -967,12 +967,12 @@ If provided, the results are limited to a subset of files matching one of the pr
.PP
\-r
.RS 4
-recurse into sub\-trees
+Recurse into sub\-trees\&.
.RE
.PP
\-t
.RS 4
-show tree entry itself as well as subtrees\&. Implies \-r\&.
+Show tree entry itself as well as subtrees\&. Implies \-r\&.
.RE
.PP
\-\-root
@@ -1014,7 +1014,7 @@ By default,
\fIgit diff\-tree \-\-stdin\fR
shows differences, either in machine\-readable form (without
\fB\-p\fR) or in patch form (with
-\fB\-p\fR)\&. This output can be suppressed\&. It is only useful with
+\fB\-p\fR)\&. This output can be suppressed\&. It is only useful with the
\fB\-v\fR
flag\&.
.RE
@@ -1088,7 +1088,7 @@ and we are outputting in
.PP
\-\-expand\-tabs=<n>, \-\-expand\-tabs, \-\-no\-expand\-tabs
.RS 4
-Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of
+Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is a multiple of
\fI<n>\fR) in the log message before showing it in the output\&.
\fB\-\-expand\-tabs\fR
is a short\-hand for
@@ -1133,7 +1133,7 @@ argument, use the ref to find the notes to display\&. The ref can specify the fu
\fBrefs/\fR
and otherwise
\fBrefs/notes/\fR
-is prefixed to form a full name of the ref\&.
+is prefixed to form the full name of the ref\&.
.sp
Multiple \-\-notes options can be combined to control which notes are being displayed\&. Examples: "\-\-notes=foo" will show only notes from "refs/notes/foo"; "\-\-notes=foo \-\-notes" will show both notes from "refs/notes/foo" and from the default notes ref(s)\&.
.RE
@@ -1184,7 +1184,7 @@ option\&. It implies the
\fB\-c\fR
and
\fB\-p\fR
-options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification\&. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other "empty diff" case\&.
+options and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification\&. When all hunks are uninteresting, the commit itself and the commit log message are not shown, just like in any other "empty diff" case\&.
.RE
.PP
\-\-combined\-all\-paths
@@ -2732,7 +2732,7 @@ What the \-p option produces is slightly different from the traditional diff for
.sp -1
.IP " 1." 4.2
.\}
-It is preceded with a "git diff" header that looks like this:
+It is preceded by a "git diff" header that looks like this:
.sp
.if n \{\
.RS 4
@@ -2758,11 +2758,11 @@ or
\fBb/\fR
filenames\&.
.sp
-When rename/copy is involved,
+When a rename/copy is involved,
\fBfile1\fR
and
\fBfile2\fR
-show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&.
+show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&.
.RE
.sp
.RS 4
@@ -2862,11 +2862,11 @@ rename to a
.\}
Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in
\fBgitattributes\fR(5)
-for details of how to tailor to this to specific languages\&.
+for details of how to tailor this to specific languages\&.
.RE
.SH "COMBINED DIFF FORMAT"
.sp
-Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in specific format\&.
+Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&.
.sp
A "combined diff" format looks like this:
.sp
@@ -2916,7 +2916,7 @@ index fabadb8,cc95eb0\&.\&.4866510
.sp -1
.IP " 1." 4.2
.\}
-It is preceded with a "git diff" header, that looks like this (when the
+It is preceded by a "git diff" header, that looks like this (when the
\fB\-c\fR
option is used):
.sp
@@ -2970,7 +2970,7 @@ deleted file mode <mode>,<mode>
.sp
The
\fBmode <mode>,<mode>\&.\&.<mode>\fR
-line appears only if at least one of the <mode> is different 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\&.
+line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree\-ish> and are not used by combined diff format\&.
.RE
.sp
.RS 4
@@ -2981,7 +2981,7 @@ line appears only if at least one of the <mode> is different from the rest\&. Ex
.sp -1
.IP " 3." 4.2
.\}
-It is followed by two\-line from\-file/to\-file header
+It is followed by a two\-line from\-file/to\-file header:
.sp
.if n \{\
.RS 4
@@ -2994,13 +2994,13 @@ It is followed by two\-line from\-file/to\-file header
.RE
.\}
.sp
-Similar to two\-line header for traditional
+Similar to the two\-line header for the traditional
\fIunified\fR
diff format,
\fB/dev/null\fR
is used to signal created or deleted files\&.
.sp
-However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file you get a N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit
+However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit:
.sp
.if n \{\
.RS 4
@@ -3050,7 +3050,7 @@ Unlike the traditional \fIunified\fR diff format, which shows two files A and B
.sp
A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, 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 \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&.
+In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&.
.sp
When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit diff\-files \-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&.
.SH "OTHER DIFF FORMATS"