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