2005-05-10 23:32:30 +02: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 18:37:15 +01:00
|
|
|
[verse]
|
2006-01-28 11:19:22 +01:00
|
|
|
'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
|
|
|
|
[-t] [-r] [-c | --cc] [--root] [<common diff options>]
|
|
|
|
<tree-ish> [<tree-ish>] [<path>...]
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
|
|
|
Compares the content and mode of the blobs found via two tree objects.
|
|
|
|
|
2005-09-23 12:06:04 +02:00
|
|
|
If there is only one <tree-ish> given, the commit is compared with its parents
|
|
|
|
(see --stdin below).
|
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
Note that "git-diff-tree" can use the tree encapsulated in a commit object.
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
2005-07-13 21:52:35 +02:00
|
|
|
include::diff-options.txt[]
|
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
<tree-ish>::
|
|
|
|
The id of a tree object.
|
|
|
|
|
2005-06-19 22:14:53 +02:00
|
|
|
<path>...::
|
2005-05-10 23:32:30 +02:00
|
|
|
If provided, the results are limited to a subset of files
|
|
|
|
matching one of these prefix strings.
|
2006-06-03 22:27:26 +02:00
|
|
|
i.e., file matches `/^<pattern1>|<pattern2>|.../`
|
2005-06-19 22:14:53 +02:00
|
|
|
Note that this parameter does not provide any wildcard or regexp
|
2005-05-10 23:32:30 +02:00
|
|
|
features.
|
|
|
|
|
2005-10-28 19:04:49 +02:00
|
|
|
-r::
|
|
|
|
recurse into sub-trees
|
|
|
|
|
2005-05-25 08:24:22 +02:00
|
|
|
-t::
|
|
|
|
show tree entry itself as well as subtrees. Implies -r.
|
|
|
|
|
2005-05-28 16:42:17 +02:00
|
|
|
--root::
|
|
|
|
When '--root' is specified the initial commit will be showed as a big
|
|
|
|
creation event. This is equivalent to a diff against the NULL tree.
|
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
--stdin::
|
|
|
|
When '--stdin' is specified, the command does not take
|
|
|
|
<tree-ish> arguments from the command line. Instead, it
|
2008-08-06 07:32:28 +02:00
|
|
|
reads either one <commit> or a list of <commit>
|
2005-05-10 23:32:30 +02:00
|
|
|
separated with a single space from its standard input.
|
|
|
|
+
|
|
|
|
When a single commit is given on one line of such input, it compares
|
|
|
|
the commit with its parents. The following flags further affects its
|
2008-08-06 07:32:28 +02:00
|
|
|
behavior. The remaining commits, when given, are used as if they are
|
|
|
|
parents of the first commit.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
-m::
|
|
|
|
By default, "git-diff-tree --stdin" does not show
|
|
|
|
differences for merge commits. With this flag, it shows
|
2006-04-09 15:43:17 +02:00
|
|
|
differences to that commit from all of its parents. See
|
|
|
|
also '-c'.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
-s::
|
|
|
|
By default, "git-diff-tree --stdin" shows differences,
|
|
|
|
either in machine-readable form (without '-p') or in patch
|
2005-12-29 10:20:06 +01:00
|
|
|
form (with '-p'). This output can be suppressed. It is
|
2005-05-10 23:32:30 +02:00
|
|
|
only useful with '-v' flag.
|
|
|
|
|
|
|
|
-v::
|
|
|
|
This flag causes "git-diff-tree --stdin" to also show
|
|
|
|
the commit message before the differences.
|
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
include::pretty-options.txt[]
|
2005-06-19 22:14:53 +02:00
|
|
|
|
2005-11-10 06:30:12 +01:00
|
|
|
--no-commit-id::
|
|
|
|
git-diff-tree outputs a line with the commit ID when
|
|
|
|
applicable. This flag suppressed the commit ID output.
|
|
|
|
|
2006-04-09 15:43:17 +02:00
|
|
|
-c::
|
|
|
|
This flag changes the way a merge commit is displayed
|
2006-01-28 11:19:22 +01:00
|
|
|
(which means it is useful only when the command is given
|
|
|
|
one <tree-ish>, or '--stdin'). It shows the differences
|
2006-04-09 15:43:17 +02:00
|
|
|
from each of the parents to the merge result simultaneously
|
|
|
|
instead of showing pairwise diff between a parent and the
|
|
|
|
result one at a time (which is what the '-m' option does).
|
|
|
|
Furthermore, it lists only files which were modified
|
|
|
|
from all parents.
|
|
|
|
|
2006-05-03 12:51:40 +02:00
|
|
|
--cc::
|
2006-04-09 15:43:17 +02:00
|
|
|
This flag changes the way a merge commit patch is displayed,
|
|
|
|
in a similar way to the '-c' option. It implies the '-c'
|
|
|
|
and '-p' options and further compresses the patch output
|
2008-07-24 01:16:05 +02: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 11:19:22 +01:00
|
|
|
|
2006-02-07 12:47:44 +01:00
|
|
|
--always::
|
|
|
|
Show the commit itself and the commit log message even
|
|
|
|
if the diff itself is empty.
|
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
|
2007-05-14 01:25:45 +02:00
|
|
|
include::pretty-formats.txt[]
|
|
|
|
|
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
Limiting Output
|
|
|
|
---------------
|
|
|
|
If you're only interested in differences in a subset of files, for
|
|
|
|
example some architecture-specific files, you might do:
|
|
|
|
|
|
|
|
git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
|
|
|
|
|
|
|
|
and it will only show you what changed in those two directories.
|
|
|
|
|
|
|
|
Or if you are searching for what changed in just `kernel/sched.c`, just do
|
|
|
|
|
|
|
|
git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
|
|
|
|
|
|
|
|
and it will ignore all differences to other files.
|
|
|
|
|
|
|
|
The pattern is always the prefix, and is matched exactly. There are no
|
2005-08-05 17:05:02 +02:00
|
|
|
wildcards. Even stricter, it has to match a complete path component.
|
2005-05-10 23:32:30 +02:00
|
|
|
I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h`
|
|
|
|
so it can be used to name subdirectories.
|
|
|
|
|
|
|
|
An example of normal usage is:
|
|
|
|
|
|
|
|
torvalds@ppc970:~/git> git-diff-tree 5319e4......
|
2005-09-08 02:26:23 +02:00
|
|
|
*100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
which tells you that the last commit changed just one file (it's from
|
|
|
|
this one:
|
|
|
|
|
2005-10-03 19:16:30 +02:00
|
|
|
-----------------------------------------------------------------------------
|
|
|
|
commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
|
|
|
|
tree 5319e4d609cdd282069cc4dce33c1db559539b03
|
|
|
|
parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
|
|
|
|
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
|
|
|
|
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
|
|
|
|
|
|
|
|
Make "git-fsck-objects" print out all the root commits it finds.
|
|
|
|
|
|
|
|
Once I do the reference tracking, I'll also make it print out all the
|
|
|
|
HEAD commits it finds, which is even more interesting.
|
|
|
|
-----------------------------------------------------------------------------
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
in case you care).
|
|
|
|
|
|
|
|
Output format
|
|
|
|
-------------
|
|
|
|
include::diff-format.txt[]
|
|
|
|
|
|
|
|
|
|
|
|
Author
|
|
|
|
------
|
|
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
|
|
|
|
Documentation
|
|
|
|
--------------
|
|
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|