1 .\"Generated by db2man.xsl. Don't modify this, modify the source.
10 .de Sp \" Vertical space (when we can't use .PP)
16 .ie \\n(.$>=3 .ne \\$3
20 .TH "GIT-DIFF-TREE" 1 "" "" ""
22 git-diff-tree \- Compares the content and mode of blobs found via two tree objects
26 \fIgit\-diff\-tree\fR [\-\-stdin] [\-m] [\-s] [\-v] [\-\-no\-commit\-id] [\-\-pretty]
27 [\-t] [\-r] [\-c | \-\-cc] [\-\-root] [<common diff options>]
28 <tree\-ish> [<tree\-ish>] [<path>...]
34 Compares the content and mode of the blobs found via two tree objects\&.
37 If there is only one <tree\-ish> given, the commit is compared with its parents (see \-\-stdin below)\&.
40 Note that "git\-diff\-tree" can use the tree encapsulated in a commit object\&.
46 Generate patch (see section on generating patches)
54 \\0 line termination on output
58 Show only names of changed files\&.
62 Show only names and status of changed files\&.
66 Instead of the first handful characters, show full object name of pre\- and post\-image blob on the "index" line when generating a patch format output\&.
70 Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
74 Break complete rewrite changes into pairs of delete and create\&.
82 Detect copies as well as renames\&.
85 \-\-diff\-filter=[ACDMRTUXB*]
86 Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their type (mode) changed (T), are Unmerged (U), are Unknown (X), or have had their pairing Broken (B)\&. Any combination of the filter characters may be used\&. When * (All\-or\-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected\&.
89 \-\-find\-copies\-harder
90 For performance reasons, by default, \-C option finds copies only if the original file of the copy was modified in the same changeset\&. This flag makes the command inspect unmodified files as candidates for the source of copy\&. This is a very expensive operation for large projects, so use it with caution\&.
94 \-M and \-C options require O(n^2) processing time where n is the number of potential rename/copy targets\&. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number\&.
98 Look for differences that contain the change in <string>\&.
102 When \-S finds a change, show all the changes in that changeset, not just the files that contain the change in <string>\&.
106 Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line\&.
110 Swap two inputs; that is, show differences from index or on\-disk file to tree contents\&.
113 For more detailed explanation on these common options, see also diffcore documentation: \fIdiffcore.html\fR\&.
117 The id of a tree object\&.
121 If provided, the results are limited to a subset of files matching one of these prefix strings\&. ie file matches /^<pattern1>|<pattern2>|.../ Note that this parameter does not provide any wildcard or regexp features\&.
125 recurse into sub\-trees
129 show tree entry itself as well as subtrees\&. Implies \-r\&.
133 When \fI\-\-root\fR is specified the initial commit will be showed as a big creation event\&. This is equivalent to a diff against the NULL tree\&.
137 When \fI\-\-stdin\fR is specified, the command does not take <tree\-ish> arguments from the command line\&. Instead, it reads either one <commit> or a pair of <tree\-ish> separated with a single space from its standard input\&.
139 When a single commit is given on one line of such input, it compares the commit with its parents\&. The following flags further affects its behaviour\&. This does not apply to the case where two <tree\-ish> separated with a single space are given\&.
143 By default, "git\-diff\-tree \-\-stdin" does not show differences for merge commits\&. With this flag, it shows differences to that commit from all of its parents\&.
147 By default, "git\-diff\-tree \-\-stdin" shows differences, either in machine\-readable form (without \fI\-p\fR) or in patch form (with \fI\-p\fR)\&. This output can be suppressed\&. It is only useful with \fI\-v\fR flag\&.
151 This flag causes "git\-diff\-tree \-\-stdin" to also show the commit message before the differences\&.
154 \-\-pretty[=(raw|medium|short)]
155 This is used to control "pretty printing" format of the commit message\&. Without "=<style>", it defaults to medium\&.
159 git\-diff\-tree outputs a line with the commit ID when applicable\&. This flag suppressed the commit ID output\&.
163 These flags change the way a merge commit is displayed (which means it is useful only when the command is given one <tree\-ish>, or \fI\-\-stdin\fR)\&. It shows the differences from each of the parents to the merge result simultaneously, instead of showing pairwise diff between a parent and the result one at a time, which \fI\-m\fR option output does\&. \fI\-\-cc\fR further compresses the output by omiting hunks that show differences from only one parent, or show the same change from all but one parent for an Octopus merge\&. When this optimization makes all hunks disappear, the commit itself and the commit log message is not shown, just like any other "empty diff" cases\&.
167 Show the commit itself and the commit log message even if the diff itself is empty\&.
169 .SH "LIMITING OUTPUT"
172 If you're only interested in differences in a subset of files, for example some architecture\-specific files, you might do:
175 git\-diff\-tree \-r <tree\-ish> <tree\-ish> arch/ia64 include/asm\-ia64
179 and it will only show you what changed in those two directories\&.
182 Or if you are searching for what changed in just kernel/sched\&.c, just do
185 git\-diff\-tree \-r <tree\-ish> <tree\-ish> kernel/sched\&.c
189 and it will ignore all differences to other files\&.
192 The pattern is always the prefix, and is matched exactly\&. There are no wildcards\&. Even stricter, it has to match a complete path component\&. I\&.e\&. "foo" does not pick up foobar\&.h\&. "foo" does match foo/bar\&.h so it can be used to name subdirectories\&.
195 An example of normal usage is:
198 torvalds@ppc970:~/git> git\-diff\-tree 5319e4\&.\&.\&.\&.\&.\&.
199 *100664\->100664 blob ac348b\&.\&.\&.\&.\&.\&.\&.\->a01513\&.\&.\&.\&.\&.\&.\&. git\-fsck\-objects\&.c
203 which tells you that the last commit changed just one file (it's from this one:
206 commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
207 tree 5319e4d609cdd282069cc4dce33c1db559539b03
208 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
209 author Linus Torvalds <torvalds@ppc970\&.osdl\&.org> Sat Apr 9 12:02:30 2005
210 committer Linus Torvalds <torvalds@ppc970\&.osdl\&.org> Sat Apr 9 12:02:30 2005
212 Make "git\-fsck\-objects" print out all the root commits it finds\&.
214 Once I do the reference tracking, I'll also make it print out all the
215 HEAD commits it finds, which is even more interesting\&.
222 The output format from "git\-diff\-index", "git\-diff\-tree" and "git\-diff\-files" are very similar\&.
225 These commands all compare two sets of things; what is compared differs:
228 git\-diff\-index <tree\-ish>
229 compares the <tree\-ish> and the files on the filesystem\&.
232 git\-diff\-index \-\-cached <tree\-ish>
233 compares the <tree\-ish> and the index\&.
236 git\-diff\-tree [\-r] <tree\-ish\-1> <tree\-ish\-2> [<pattern>...]
237 compares the trees named by the two arguments\&.
240 git\-diff\-files [<pattern>...]
241 compares the index and the files on the filesystem\&.
244 An output line is formatted this way:
247 in\-place edit :100644 100644 bcd1234\&.\&.\&. 0123456\&.\&.\&. M file0
248 copy\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. C68 file1 file2
249 rename\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. R86 file1 file3
250 create :000000 100644 0000000\&.\&.\&. 1234567\&.\&.\&. A file4
251 delete :100644 000000 1234567\&.\&.\&. 0000000\&.\&.\&. D file5
252 unmerged :000000 000000 0000000\&.\&.\&. 0000000\&.\&.\&. U file6
254 That is, from the left to the right:
261 mode for "src"; 000000 if creation or unmerged\&.
267 mode for "dst"; 000000 if deletion or unmerged\&.
273 sha1 for "src"; 0{40} if creation or unmerged\&.
279 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree"\&.
285 status, followed by optional "score" number\&.
288 a tab or a NUL when \fI\-z\fR option is used\&.
294 a tab or a NUL when \fI\-z\fR option is used; only exists for C or R\&.
297 path for "dst"; only exists for C or R\&.
300 an LF or a NUL when \fI\-z\fR option is used, to terminate the record\&.
304 <sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index\&.
310 :100644 100644 5be4a4\&.\&.\&.\&.\&.\&. 000000\&.\&.\&.\&.\&.\&. M file\&.c
312 When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
314 .SH "GENERATING PATCHES WITH -P"
317 When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file\&.
320 The patch generation can be customized at two levels\&.
324 When the environment variable \fIGIT_EXTERNAL_DIFF\fR is not set, these commands internally invoke "diff" like this:
328 diff \-L a/<path> \-L b/<path> \-pu <old> <new>
330 For added files, /dev/null is used for <old>\&. For removed files, /dev/null is used for <new>
332 The "diff" formatting options can be customized via the environment variable \fIGIT_DIFF_OPTS\fR\&. For example, if you prefer context diff:
335 GIT_DIFF_OPTS=\-c git\-diff\-index \-p HEAD
339 When the environment variable \fIGIT_EXTERNAL_DIFF\fR is set, the program named by it is called, instead of the diff invocation described above\&.
341 For a path that is added, removed, or modified, \fIGIT_EXTERNAL_DIFF\fR is called with 7 parameters:
345 path old\-file old\-hex old\-mode new\-file new\-hex new\-mode
351 are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,
355 are the 40\-hexdigit SHA1 hashes,
359 are the octal representation of the file modes\&.
361 The file parameters can point at the user's working file (e\&.g\&. new\-file in "git\-diff\-files"), /dev/null (e\&.g\&. old\-file when a new file is added), or a temporary file (e\&.g\&. old\-file in the index)\&. \fIGIT_EXTERNAL_DIFF\fR should not worry about unlinking the temporary file \-\-\- it is removed when \fIGIT_EXTERNAL_DIFF\fR exits\&.
365 For a path that is unmerged, \fIGIT_EXTERNAL_DIFF\fR is called with 1 parameter, <path>\&.
367 .SH "GIT SPECIFIC EXTENSION TO DIFF FORMAT"
370 What \-p option produces is slightly different from the traditional diff format\&.
374 It is preceded with a "git diff" header, that looks like this:
378 diff \-\-git a/file1 b/file2
380 The a/ and b/ filenames are the same unless rename/copy is involved\&. Especially, even for a creation or a deletion, /dev/null is _not_ used in place of a/ or b/ filenames\&.
382 When rename/copy is involved, file1 and file2 show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&.
385 It is followed by one or more extended header lines:
390 deleted file mode <mode>
396 similarity index <number>
397 dissimilarity index <number>
398 index <hash>\&.\&.<hash> <mode>
402 TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
405 .SH "COMBINED DIFF FORMAT"
408 git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this:
411 diff \-\-combined describe\&.c
413 return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
416 \- static void describe(char *arg)
417 \-static void describe(struct commit *cmit, int last_one)
418 ++static void describe(char *arg, int last_one)
420 + unsigned char sha1[20];
421 + struct commit *cmit;
423 Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN\&. One column for each of fileN is prepended to the output line to note how X's line is different from it\&.
426 A \- character in the column N means that the line appears in fileN but it does not appear in the last file\&. A + character in the column N means that the line appears in the last file, and fileN does not have that line\&.
429 In the above example output, the function signature was changed from both files (hence two \- removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2)\&. Also two other lines are the same from file1 but do not appear in file2 (hence prefixed with +)\&.
432 When shown by git diff\-tree \-c, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by git diff\-files \-c, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&.
437 Written by Linus Torvalds <torvalds@osdl\&.org>
442 Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
447 Part of the \fBgit\fR(7) suite