2005-05-10 21:32:30 +00:00
|
|
|
git-diff-tree(1)
|
|
|
|
================
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
|
|
|
git-diff-tree - Compares the content and mode of blobs found via two tree objects
|
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2005-12-31 17:37:15 +00:00
|
|
|
[verse]
|
2008-06-30 06:09:04 +00:00
|
|
|
'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
|
2020-09-14 18:36:52 +00:00
|
|
|
[-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
|
log,diff-tree: add --combined-all-paths option
The combined diff format for merges will only list one filename, even if
rename or copy detection is active. For example, with raw format one
might see:
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c
This doesn't let us know what the original name of bar.sh was in the
first parent, and doesn't let us know what either of the original names
of phooey.c were in either of the parents. In contrast, for non-merge
commits, raw format does provide original filenames (and a rename score
to boot). In order to also provide original filenames for merge
commits, add a --combined-all-paths option (which must be used with
either -c or --cc, and is likely only useful with rename or copy
detection active) so that we can print tab-separated filenames when
renames are involved. This transforms the above output to:
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c desc.c desc.c
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM foo.sh bar.sh bar.sh
::100644 100644 100644 e07d6c5 9042e82 ee91881 RR fooey.c fuey.c phooey.c
Further, in patch format, this changes the from/to headers so that
instead of just having one "from" header, we get one for each parent.
For example, instead of having
--- a/phooey.c
+++ b/phooey.c
we would see
--- a/fooey.c
--- a/fuey.c
+++ b/phooey.c
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-02-08 01:12:46 +00:00
|
|
|
[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
|
|
|
Compares the content and mode of the blobs found via two tree objects.
|
|
|
|
|
2005-09-23 10:06:04 +00:00
|
|
|
If there is only one <tree-ish> given, the commit is compared with its parents
|
|
|
|
(see --stdin below).
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
Note that 'git diff-tree' can use the tree encapsulated in a commit object.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
2005-07-13 19:52:35 +00:00
|
|
|
include::diff-options.txt[]
|
|
|
|
|
2005-05-10 21:32:30 +00:00
|
|
|
<tree-ish>::
|
|
|
|
The id of a tree object.
|
|
|
|
|
2005-06-19 20:14:53 +00:00
|
|
|
<path>...::
|
2005-05-10 21:32:30 +00:00
|
|
|
If provided, the results are limited to a subset of files
|
2019-02-04 10:36:18 +00:00
|
|
|
matching one of the provided pathspecs.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2005-10-28 17:04:49 +00:00
|
|
|
-r::
|
|
|
|
recurse into sub-trees
|
|
|
|
|
2005-05-25 06:24:22 +00:00
|
|
|
-t::
|
|
|
|
show tree entry itself as well as subtrees. Implies -r.
|
|
|
|
|
2005-05-28 14:42:17 +00:00
|
|
|
--root::
|
2016-06-28 11:40:11 +00:00
|
|
|
When `--root` is specified the initial commit will be shown as a big
|
2005-05-28 14:42:17 +00:00
|
|
|
creation event. This is equivalent to a diff against the NULL tree.
|
|
|
|
|
2020-09-14 18:36:52 +00:00
|
|
|
--merge-base::
|
|
|
|
Instead of comparing the <tree-ish>s directly, use the merge
|
|
|
|
base between the two <tree-ish>s as the "before" side. There
|
|
|
|
must be two <tree-ish>s given and they must both be commits.
|
|
|
|
|
2005-05-10 21:32:30 +00:00
|
|
|
--stdin::
|
2016-06-28 11:40:11 +00:00
|
|
|
When `--stdin` is specified, the command does not take
|
2005-05-10 21:32:30 +00:00
|
|
|
<tree-ish> arguments from the command line. Instead, it
|
Teach git diff-tree --stdin to diff trees
When feeding trees on the command line, you can give exactly two
trees, not three nor one; --stdin now supports this "two tree" form on
its input, in addition to accepting lines with one or more commits.
When diffing trees (either specified on the command line or from the
standard input), the -s, -v, --pretty, --abbrev-commit, --encoding,
--no-commit-id, and --always options are ignored, since they do not
apply to trees; and the -m, -c, and --cc options are ignored since
they would be meaningful only with three or more trees, which is not
supported (yet).
Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-10 16:12:58 +00:00
|
|
|
reads lines containing either two <tree>, one <commit>, or a
|
|
|
|
list of <commit> from its standard input. (Use a single space
|
|
|
|
as separator.)
|
2005-05-10 21:32:30 +00:00
|
|
|
+
|
Teach git diff-tree --stdin to diff trees
When feeding trees on the command line, you can give exactly two
trees, not three nor one; --stdin now supports this "two tree" form on
its input, in addition to accepting lines with one or more commits.
When diffing trees (either specified on the command line or from the
standard input), the -s, -v, --pretty, --abbrev-commit, --encoding,
--no-commit-id, and --always options are ignored, since they do not
apply to trees; and the -m, -c, and --cc options are ignored since
they would be meaningful only with three or more trees, which is not
supported (yet).
Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-10 16:12:58 +00:00
|
|
|
When two trees are given, it compares the first tree with the second.
|
2008-08-10 16:12:53 +00:00
|
|
|
When a single commit is given, it compares the commit with its
|
|
|
|
parents. The remaining commits, when given, are used as if they are
|
2008-08-06 05:32:28 +00:00
|
|
|
parents of the first commit.
|
2008-08-10 16:12:53 +00:00
|
|
|
+
|
Teach git diff-tree --stdin to diff trees
When feeding trees on the command line, you can give exactly two
trees, not three nor one; --stdin now supports this "two tree" form on
its input, in addition to accepting lines with one or more commits.
When diffing trees (either specified on the command line or from the
standard input), the -s, -v, --pretty, --abbrev-commit, --encoding,
--no-commit-id, and --always options are ignored, since they do not
apply to trees; and the -m, -c, and --cc options are ignored since
they would be meaningful only with three or more trees, which is not
supported (yet).
Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-10 16:12:58 +00:00
|
|
|
When comparing two trees, the ID of both trees (separated by a space
|
|
|
|
and terminated by a newline) is printed before the difference. When
|
|
|
|
comparing commits, the ID of the first (or only) commit, followed by a
|
|
|
|
newline, is printed.
|
2008-08-10 16:12:53 +00:00
|
|
|
+
|
2008-12-19 12:14:18 +00:00
|
|
|
The following flags further affect the behavior when comparing
|
Teach git diff-tree --stdin to diff trees
When feeding trees on the command line, you can give exactly two
trees, not three nor one; --stdin now supports this "two tree" form on
its input, in addition to accepting lines with one or more commits.
When diffing trees (either specified on the command line or from the
standard input), the -s, -v, --pretty, --abbrev-commit, --encoding,
--no-commit-id, and --always options are ignored, since they do not
apply to trees; and the -m, -c, and --cc options are ignored since
they would be meaningful only with three or more trees, which is not
supported (yet).
Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-10 16:12:58 +00:00
|
|
|
commits (but not trees).
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
-m::
|
2010-01-09 23:33:00 +00:00
|
|
|
By default, 'git diff-tree --stdin' does not show
|
2005-05-10 21:32:30 +00:00
|
|
|
differences for merge commits. With this flag, it shows
|
2006-04-09 13:43:17 +00:00
|
|
|
differences to that commit from all of its parents. See
|
2016-06-28 11:40:10 +00:00
|
|
|
also `-c`.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
-s::
|
2010-01-09 23:33:00 +00:00
|
|
|
By default, 'git diff-tree --stdin' shows differences,
|
2016-06-28 11:40:10 +00:00
|
|
|
either in machine-readable form (without `-p`) or in patch
|
|
|
|
form (with `-p`). This output can be suppressed. It is
|
|
|
|
only useful with `-v` flag.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
-v::
|
2010-01-09 23:33:00 +00:00
|
|
|
This flag causes 'git diff-tree --stdin' to also show
|
2005-05-10 21:32:30 +00:00
|
|
|
the commit message before the differences.
|
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
include::pretty-options.txt[]
|
2005-06-19 20:14:53 +00:00
|
|
|
|
2005-11-10 05:30:12 +00:00
|
|
|
--no-commit-id::
|
2010-01-09 23:33:00 +00:00
|
|
|
'git diff-tree' outputs a line with the commit ID when
|
2005-11-10 05:30:12 +00:00
|
|
|
applicable. This flag suppressed the commit ID output.
|
|
|
|
|
2006-04-09 13:43:17 +00:00
|
|
|
-c::
|
|
|
|
This flag changes the way a merge commit is displayed
|
2006-01-28 10:19:22 +00:00
|
|
|
(which means it is useful only when the command is given
|
2016-06-28 11:40:11 +00:00
|
|
|
one <tree-ish>, or `--stdin`). It shows the differences
|
2006-04-09 13:43:17 +00:00
|
|
|
from each of the parents to the merge result simultaneously
|
|
|
|
instead of showing pairwise diff between a parent and the
|
2016-06-28 11:40:10 +00:00
|
|
|
result one at a time (which is what the `-m` option does).
|
2006-04-09 13:43:17 +00:00
|
|
|
Furthermore, it lists only files which were modified
|
|
|
|
from all parents.
|
|
|
|
|
2006-05-03 10:51:40 +00:00
|
|
|
--cc::
|
2006-04-09 13:43:17 +00:00
|
|
|
This flag changes the way a merge commit patch is displayed,
|
2016-06-28 11:40:10 +00:00
|
|
|
in a similar way to the `-c` option. It implies the `-c`
|
|
|
|
and `-p` options and further compresses the patch output
|
2008-07-23 23:16:05 +00:00
|
|
|
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.
|
2006-01-28 10:19:22 +00:00
|
|
|
|
log,diff-tree: add --combined-all-paths option
The combined diff format for merges will only list one filename, even if
rename or copy detection is active. For example, with raw format one
might see:
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c
This doesn't let us know what the original name of bar.sh was in the
first parent, and doesn't let us know what either of the original names
of phooey.c were in either of the parents. In contrast, for non-merge
commits, raw format does provide original filenames (and a rename score
to boot). In order to also provide original filenames for merge
commits, add a --combined-all-paths option (which must be used with
either -c or --cc, and is likely only useful with rename or copy
detection active) so that we can print tab-separated filenames when
renames are involved. This transforms the above output to:
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c desc.c desc.c
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM foo.sh bar.sh bar.sh
::100644 100644 100644 e07d6c5 9042e82 ee91881 RR fooey.c fuey.c phooey.c
Further, in patch format, this changes the from/to headers so that
instead of just having one "from" header, we get one for each parent.
For example, instead of having
--- a/phooey.c
+++ b/phooey.c
we would see
--- a/fooey.c
--- a/fuey.c
+++ b/phooey.c
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-02-08 01:12:46 +00:00
|
|
|
--combined-all-paths::
|
|
|
|
This flag causes combined diffs (used for merge commits) to
|
|
|
|
list the name of the file from all parents. It thus only has
|
|
|
|
effect when -c or --cc are specified, and is likely only
|
|
|
|
useful if filename changes are detected (i.e. when either
|
|
|
|
rename or copy detection have been requested).
|
|
|
|
|
2006-02-07 11:47:44 +00:00
|
|
|
--always::
|
|
|
|
Show the commit itself and the commit log message even
|
|
|
|
if the diff itself is empty.
|
|
|
|
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
include::pretty-formats.txt[]
|
2019-03-29 12:35:15 +00:00
|
|
|
|
2005-05-10 21:32:30 +00:00
|
|
|
include::diff-format.txt[]
|
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 07:07:32 +00:00
|
|
|
Part of the linkgit:git[1] suite
|