]>
Commit | Line | Data |
---|---|---|
2cf565c5 DG |
1 | git-diff-tree(1) |
2 | ================ | |
2cf565c5 DG |
3 | |
4 | NAME | |
5 | ---- | |
6 | git-diff-tree - Compares the content and mode of blobs found via two tree objects | |
7 | ||
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
353ce815 | 11 | [verse] |
b1889c36 | 12 | 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] |
34801cab JH |
13 | [-t] [-r] [-c | --cc] [--root] [<common diff options>] |
14 | <tree-ish> [<tree-ish>] [<path>...] | |
2cf565c5 DG |
15 | |
16 | DESCRIPTION | |
17 | ----------- | |
18 | Compares the content and mode of the blobs found via two tree objects. | |
19 | ||
ff8489cb RW |
20 | If there is only one <tree-ish> given, the commit is compared with its parents |
21 | (see --stdin below). | |
22 | ||
ba020ef5 | 23 | Note that 'git-diff-tree' can use the tree encapsulated in a commit object. |
2cf565c5 DG |
24 | |
25 | OPTIONS | |
26 | ------- | |
dda2d79a JH |
27 | include::diff-options.txt[] |
28 | ||
2cf565c5 DG |
29 | <tree-ish>:: |
30 | The id of a tree object. | |
31 | ||
232b75ab | 32 | <path>...:: |
2cf565c5 DG |
33 | If provided, the results are limited to a subset of files |
34 | matching one of these prefix strings. | |
abda1ef5 | 35 | i.e., file matches `/^<pattern1>|<pattern2>|.../` |
232b75ab | 36 | Note that this parameter does not provide any wildcard or regexp |
2cf565c5 DG |
37 | features. |
38 | ||
50b8e355 CS |
39 | -r:: |
40 | recurse into sub-trees | |
41 | ||
4cae1a96 JH |
42 | -t:: |
43 | show tree entry itself as well as subtrees. Implies -r. | |
44 | ||
0746b620 TG |
45 | --root:: |
46 | When '--root' is specified the initial commit will be showed as a big | |
47 | creation event. This is equivalent to a diff against the NULL tree. | |
48 | ||
2cf565c5 DG |
49 | --stdin:: |
50 | When '--stdin' is specified, the command does not take | |
51 | <tree-ish> arguments from the command line. Instead, it | |
eabbc99a | 52 | reads either one <commit> or a list of <commit> |
2cf565c5 DG |
53 | separated with a single space from its standard input. |
54 | + | |
55 | When a single commit is given on one line of such input, it compares | |
56 | the commit with its parents. The following flags further affects its | |
eabbc99a JH |
57 | behavior. The remaining commits, when given, are used as if they are |
58 | parents of the first commit. | |
2cf565c5 DG |
59 | |
60 | -m:: | |
ba020ef5 | 61 | By default, 'git-diff-tree --stdin' does not show |
2cf565c5 | 62 | differences for merge commits. With this flag, it shows |
a13ba129 PB |
63 | differences to that commit from all of its parents. See |
64 | also '-c'. | |
2cf565c5 DG |
65 | |
66 | -s:: | |
ba020ef5 | 67 | By default, 'git-diff-tree --stdin' shows differences, |
2cf565c5 | 68 | either in machine-readable form (without '-p') or in patch |
89438677 | 69 | form (with '-p'). This output can be suppressed. It is |
2cf565c5 DG |
70 | only useful with '-v' flag. |
71 | ||
72 | -v:: | |
ba020ef5 | 73 | This flag causes 'git-diff-tree --stdin' to also show |
2cf565c5 DG |
74 | the commit message before the differences. |
75 | ||
331b51d2 | 76 | include::pretty-options.txt[] |
232b75ab | 77 | |
601c978c | 78 | --no-commit-id:: |
ba020ef5 | 79 | 'git-diff-tree' outputs a line with the commit ID when |
601c978c PR |
80 | applicable. This flag suppressed the commit ID output. |
81 | ||
a13ba129 PB |
82 | -c:: |
83 | This flag changes the way a merge commit is displayed | |
34801cab JH |
84 | (which means it is useful only when the command is given |
85 | one <tree-ish>, or '--stdin'). It shows the differences | |
a13ba129 PB |
86 | from each of the parents to the merge result simultaneously |
87 | instead of showing pairwise diff between a parent and the | |
88 | result one at a time (which is what the '-m' option does). | |
89 | Furthermore, it lists only files which were modified | |
90 | from all parents. | |
91 | ||
de5f2bf3 | 92 | --cc:: |
a13ba129 PB |
93 | This flag changes the way a merge commit patch is displayed, |
94 | in a similar way to the '-c' option. It implies the '-c' | |
95 | and '-p' options and further compresses the patch output | |
ea3d988d JH |
96 | by omitting uninteresting hunks whose the contents in the parents |
97 | have only two variants and the merge result picks one of them | |
98 | without modification. When all hunks are uninteresting, the commit | |
99 | itself and the commit log message is not shown, just like in any other | |
100 | "empty diff" case. | |
34801cab | 101 | |
3904848c PB |
102 | --always:: |
103 | Show the commit itself and the commit log message even | |
104 | if the diff itself is empty. | |
105 | ||
2cf565c5 | 106 | |
331b51d2 JN |
107 | include::pretty-formats.txt[] |
108 | ||
109 | ||
2cf565c5 DG |
110 | Limiting Output |
111 | --------------- | |
112 | If you're only interested in differences in a subset of files, for | |
113 | example some architecture-specific files, you might do: | |
114 | ||
b1889c36 | 115 | git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64 |
2cf565c5 DG |
116 | |
117 | and it will only show you what changed in those two directories. | |
118 | ||
119 | Or if you are searching for what changed in just `kernel/sched.c`, just do | |
120 | ||
b1889c36 | 121 | git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c |
2cf565c5 DG |
122 | |
123 | and it will ignore all differences to other files. | |
124 | ||
125 | The pattern is always the prefix, and is matched exactly. There are no | |
2c6e4771 | 126 | wildcards. Even stricter, it has to match a complete path component. |
2cf565c5 DG |
127 | I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h` |
128 | so it can be used to name subdirectories. | |
129 | ||
130 | An example of normal usage is: | |
131 | ||
b1889c36 | 132 | torvalds@ppc970:~/git> git diff-tree 5319e4...... |
215a7ad1 | 133 | *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c |
2cf565c5 DG |
134 | |
135 | which tells you that the last commit changed just one file (it's from | |
136 | this one: | |
137 | ||
df8baa42 JF |
138 | ----------------------------------------------------------------------------- |
139 | commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8 | |
140 | tree 5319e4d609cdd282069cc4dce33c1db559539b03 | |
141 | parent b4e628ea30d5ab3606119d2ea5caeab141d38df7 | |
142 | author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005 | |
143 | committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005 | |
144 | ||
145 | Make "git-fsck-objects" print out all the root commits it finds. | |
146 | ||
147 | Once I do the reference tracking, I'll also make it print out all the | |
148 | HEAD commits it finds, which is even more interesting. | |
149 | ----------------------------------------------------------------------------- | |
2cf565c5 DG |
150 | |
151 | in case you care). | |
152 | ||
153 | Output format | |
154 | ------------- | |
155 | include::diff-format.txt[] | |
156 | ||
157 | ||
158 | Author | |
159 | ------ | |
160 | Written by Linus Torvalds <torvalds@osdl.org> | |
161 | ||
162 | Documentation | |
163 | -------------- | |
164 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
165 | ||
166 | GIT | |
167 | --- | |
9e1f0a85 | 168 | Part of the linkgit:git[1] suite |