]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/git-diff-tree.txt
[PATCH] Introducing software archaeologist's tool "pickaxe".
[thirdparty/git.git] / Documentation / git-diff-tree.txt
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] [-R] [-C] [-S<string>] [-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 -M::
37 Detect renames; implies -p, in turn implying also '-r'.
38
39 -C::
40 Detect copies as well as renames; implies -p, in turn
41 implying also '-r'.
42
43 -R::
44 Output diff in reverse.
45
46 -S<string>::
47 Look for differences that contains the change in <string>.
48
49 -r::
50 recurse
51
52 -z::
53 \0 line termination on output
54
55 --stdin::
56 When '--stdin' is specified, the command does not take
57 <tree-ish> arguments from the command line. Instead, it
58 reads either one <commit> or a pair of <tree-ish>
59 separated with a single space from its standard input.
60 +
61 When a single commit is given on one line of such input, it compares
62 the commit with its parents. The following flags further affects its
63 behaviour. This does not apply to the case where two <tree-ish>
64 separated with a single space are given.
65
66 -m::
67 By default, "git-diff-tree --stdin" does not show
68 differences for merge commits. With this flag, it shows
69 differences to that commit from all of its parents.
70
71 -s::
72 By default, "git-diff-tree --stdin" shows differences,
73 either in machine-readable form (without '-p') or in patch
74 form (with '-p'). This output can be supressed. It is
75 only useful with '-v' flag.
76
77 -v::
78 This flag causes "git-diff-tree --stdin" to also show
79 the commit message before the differences.
80
81
82 Limiting Output
83 ---------------
84 If you're only interested in differences in a subset of files, for
85 example some architecture-specific files, you might do:
86
87 git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64
88
89 and it will only show you what changed in those two directories.
90
91 Or if you are searching for what changed in just `kernel/sched.c`, just do
92
93 git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c
94
95 and it will ignore all differences to other files.
96
97 The pattern is always the prefix, and is matched exactly. There are no
98 wildcards. Even stricter, it has to match complete path comonent.
99 I.e. "foo" does not pick up `foobar.h`. "foo" does match `foo/bar.h`
100 so it can be used to name subdirectories.
101
102 An example of normal usage is:
103
104 torvalds@ppc970:~/git> git-diff-tree 5319e4......
105 *100664->100664 blob ac348b.......->a01513....... git-fsck-cache.c
106
107 which tells you that the last commit changed just one file (it's from
108 this one:
109
110 commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
111 tree 5319e4d609cdd282069cc4dce33c1db559539b03
112 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
113 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
114 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
115
116 Make "git-fsck-cache" print out all the root commits it finds.
117
118 Once I do the reference tracking, I'll also make it print out all the
119 HEAD commits it finds, which is even more interesting.
120
121 in case you care).
122
123 Output format
124 -------------
125 include::diff-format.txt[]
126
127
128 Author
129 ------
130 Written by Linus Torvalds <torvalds@osdl.org>
131
132 Documentation
133 --------------
134 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
135
136 GIT
137 ---
138 Part of the link:git.html[git] suite
139