]>
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 | -------- | |
50b8e355 | 11 | 'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] |
2cf565c5 DG |
12 | |
13 | DESCRIPTION | |
14 | ----------- | |
15 | Compares the content and mode of the blobs found via two tree objects. | |
16 | ||
ff8489cb RW |
17 | If there is only one <tree-ish> given, the commit is compared with its parents |
18 | (see --stdin below). | |
19 | ||
2cf565c5 DG |
20 | Note that "git-diff-tree" can use the tree encapsulated in a commit object. |
21 | ||
22 | OPTIONS | |
23 | ------- | |
dda2d79a JH |
24 | include::diff-options.txt[] |
25 | ||
2cf565c5 DG |
26 | <tree-ish>:: |
27 | The id of a tree object. | |
28 | ||
232b75ab | 29 | <path>...:: |
2cf565c5 DG |
30 | If provided, the results are limited to a subset of files |
31 | matching one of these prefix strings. | |
32 | ie file matches `/^<pattern1>|<pattern2>|.../` | |
232b75ab | 33 | Note that this parameter does not provide any wildcard or regexp |
2cf565c5 DG |
34 | features. |
35 | ||
50b8e355 CS |
36 | -r:: |
37 | recurse into sub-trees | |
38 | ||
4cae1a96 JH |
39 | -t:: |
40 | show tree entry itself as well as subtrees. Implies -r. | |
41 | ||
0746b620 TG |
42 | --root:: |
43 | When '--root' is specified the initial commit will be showed as a big | |
44 | creation event. This is equivalent to a diff against the NULL tree. | |
45 | ||
2cf565c5 DG |
46 | --stdin:: |
47 | When '--stdin' is specified, the command does not take | |
48 | <tree-ish> arguments from the command line. Instead, it | |
49 | reads either one <commit> or a pair of <tree-ish> | |
50 | separated with a single space from its standard input. | |
51 | + | |
52 | When a single commit is given on one line of such input, it compares | |
53 | the commit with its parents. The following flags further affects its | |
54 | behaviour. This does not apply to the case where two <tree-ish> | |
55 | separated with a single space are given. | |
56 | ||
57 | -m:: | |
58 | By default, "git-diff-tree --stdin" does not show | |
59 | differences for merge commits. With this flag, it shows | |
60 | differences to that commit from all of its parents. | |
61 | ||
62 | -s:: | |
63 | By default, "git-diff-tree --stdin" shows differences, | |
64 | either in machine-readable form (without '-p') or in patch | |
65 | form (with '-p'). This output can be supressed. It is | |
66 | only useful with '-v' flag. | |
67 | ||
68 | -v:: | |
69 | This flag causes "git-diff-tree --stdin" to also show | |
70 | the commit message before the differences. | |
71 | ||
232b75ab JH |
72 | --pretty[=(raw|medium|short)]:: |
73 | This is used to control "pretty printing" format of the | |
74 | commit message. Without "=<style>", it defaults to | |
75 | medium. | |
76 | ||
2cf565c5 DG |
77 | |
78 | Limiting Output | |
79 | --------------- | |
80 | If you're only interested in differences in a subset of files, for | |
81 | example some architecture-specific files, you might do: | |
82 | ||
83 | git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64 | |
84 | ||
85 | and it will only show you what changed in those two directories. | |
86 | ||
87 | Or if you are searching for what changed in just `kernel/sched.c`, just do | |
88 | ||
89 | git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c | |
90 | ||
91 | and it will ignore all differences to other files. | |
92 | ||
93 | The pattern is always the prefix, and is matched exactly. There are no | |
2c6e4771 | 94 | wildcards. Even stricter, it has to match a complete path component. |
2cf565c5 DG |
95 | I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h` |
96 | so it can be used to name subdirectories. | |
97 | ||
98 | An example of normal usage is: | |
99 | ||
100 | torvalds@ppc970:~/git> git-diff-tree 5319e4...... | |
215a7ad1 | 101 | *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c |
2cf565c5 DG |
102 | |
103 | which tells you that the last commit changed just one file (it's from | |
104 | this one: | |
105 | ||
df8baa42 JF |
106 | ----------------------------------------------------------------------------- |
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 | |
112 | ||
113 | Make "git-fsck-objects" print out all the root commits it finds. | |
114 | ||
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. | |
117 | ----------------------------------------------------------------------------- | |
2cf565c5 DG |
118 | |
119 | in case you care). | |
120 | ||
121 | Output format | |
122 | ------------- | |
123 | include::diff-format.txt[] | |
124 | ||
125 | ||
126 | Author | |
127 | ------ | |
128 | Written by Linus Torvalds <torvalds@osdl.org> | |
129 | ||
130 | Documentation | |
131 | -------------- | |
132 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
133 | ||
134 | GIT | |
135 | --- | |
a7154e91 | 136 | Part of the gitlink:git[7] suite |
2cf565c5 | 137 |