1 git-diff-tree(1)
2 ================
3 v0.1, May 2005
5 NAME
6 ----
7 git-diff-tree - Compares the content and mode of blobs found via two tree objects
10 SYNOPSIS
11 --------
12 'git-diff-tree' [-p] [-r] [-z] [--stdin] [-M] [-R] [-C] [-m] [-s] [-v] <tree-ish> <tree-ish> [<pattern>]\*
14 DESCRIPTION
15 -----------
16 Compares the content and mode of the blobs found via two tree objects.
18 Note that "git-diff-tree" can use the tree encapsulated in a commit object.
20 OPTIONS
21 -------
22 <tree-ish>::
23 The id of a tree object.
25 <pattern>::
26 If provided, the results are limited to a subset of files
27 matching one of these prefix strings.
28 ie file matches `/^<pattern1>|<pattern2>|.../`
29 Note that pattern does not provide any wildcard or regexp
30 features.
32 -p::
33 generate patch (see section on generating patches). For
34 git-diff-tree, this flag implies '-r' as well.
36 -M::
37 Detect renames; implies -p, in turn implying also '-r'.
39 -C::
40 Detect copies as well as renames; implies -p, in turn
41 implying also '-r'.
43 -R::
44 Output diff in reverse.
46 -r::
47 recurse
49 -z::
50 \0 line termination on output
52 --stdin::
53 When '--stdin' is specified, the command does not take
54 <tree-ish> arguments from the command line. Instead, it
55 reads either one <commit> or a pair of <tree-ish>
56 separated with a single space from its standard input.
57 +
58 When a single commit is given on one line of such input, it compares
59 the commit with its parents. The following flags further affects its
60 behaviour. This does not apply to the case where two <tree-ish>
61 separated with a single space are given.
63 -m::
64 By default, "git-diff-tree --stdin" does not show
65 differences for merge commits. With this flag, it shows
66 differences to that commit from all of its parents.
68 -s::
69 By default, "git-diff-tree --stdin" shows differences,
70 either in machine-readable form (without '-p') or in patch
71 form (with '-p'). This output can be supressed. It is
72 only useful with '-v' flag.
74 -v::
75 This flag causes "git-diff-tree --stdin" to also show
76 the commit message before the differences.
79 Limiting Output
80 ---------------
81 If you're only interested in differences in a subset of files, for
82 example some architecture-specific files, you might do:
84 git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
86 and it will only show you what changed in those two directories.
88 Or if you are searching for what changed in just `kernel/sched.c`, just do
90 git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
92 and it will ignore all differences to other files.
94 The pattern is always the prefix, and is matched exactly. There are no
95 wildcards. Even stricter, it has to match complete path comonent.
96 I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h`
97 so it can be used to name subdirectories.
99 An example of normal usage is:
101 torvalds@ppc970:~/git> git-diff-tree 5319e4......
102 *100664->100664 blob ac348b.......->a01513....... git-fsck-cache.c
104 which tells you that the last commit changed just one file (it's from
105 this one:
107 commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
108 tree 5319e4d609cdd282069cc4dce33c1db559539b03
109 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
110 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
111 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
113 Make "git-fsck-cache" print out all the root commits it finds.
115 Once I do the reference tracking, I'll also make it print out all the
116 HEAD commits it finds, which is even more interesting.
118 in case you care).
120 Output format
121 -------------
122 include::diff-format.txt[]
125 Author
126 ------
127 Written by Linus Torvalds <torvalds@osdl.org>
129 Documentation
130 --------------
131 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
133 GIT
134 ---
135 Part of the link:git.html[git] suite