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 Generate patch but keep also the default raw diff output\&.
58 Generate a diffstat instead of a patch\&.
62 Output a condensed summary of extended header information such as creations, renames and mode changes\&.
66 Generate patch and prepend its diffstat\&.
70 \\0 line termination on output
74 Show only names of changed files\&.
78 Show only names and status of changed files\&.
82 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\&.
86 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>\&.
90 Break complete rewrite changes into pairs of delete and create\&.
98 Detect copies as well as renames\&.
101 \-\-diff\-filter=[ACDMRTUXB*]
102 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\&.
105 \-\-find\-copies\-harder
106 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\&.
110 \-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\&.
114 Look for differences that contain the change in <string>\&.
118 When \-S finds a change, show all the changes in that changeset, not just the files that contain the change in <string>\&.
122 Make the <string> not a plain string but an extended POSIX regex to match\&.
126 Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line\&.
130 Swap two inputs; that is, show differences from index or on\-disk file to tree contents\&.
133 For more detailed explanation on these common options, see also diffcore documentation: \fIdiffcore.html\fR\&.
137 The id of a tree object\&.
141 If provided, the results are limited to a subset of files matching one of these prefix strings\&. i\&.e\&., file matches /^<pattern1>|<pattern2>|.../ Note that this parameter does not provide any wildcard or regexp features\&.
145 recurse into sub\-trees
149 show tree entry itself as well as subtrees\&. Implies \-r\&.
153 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\&.
157 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\&.
159 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 behavior\&. This does not apply to the case where two <tree\-ish> separated with a single space are given\&.
163 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\&. See also \fI\-c\fR\&.
167 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\&.
171 This flag causes "git\-diff\-tree \-\-stdin" to also show the commit message before the differences\&.
174 \-\-pretty[=(raw|medium|short)]
175 This is used to control "pretty printing" format of the commit message\&. Without "=<style>", it defaults to medium\&.
179 git\-diff\-tree outputs a line with the commit ID when applicable\&. This flag suppressed the commit ID output\&.
183 This flag changes 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 is what the \fI\-m\fR option does)\&. Furthermore, it lists only files which were modified from all parents\&.
187 This flag changes the way a merge commit patch is displayed, in a similar way to the \fI\-c\fR option\&. It implies the \fI\-c\fR and \fI\-p\fR options and further compresses the patch output by omitting 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 in any other "empty diff" case\&.
191 Show the commit itself and the commit log message even if the diff itself is empty\&.
193 .SH "LIMITING OUTPUT"
196 If you're only interested in differences in a subset of files, for example some architecture\-specific files, you might do:
199 git\-diff\-tree \-r <tree\-ish> <tree\-ish> arch/ia64 include/asm\-ia64
203 and it will only show you what changed in those two directories\&.
206 Or if you are searching for what changed in just kernel/sched\&.c, just do
209 git\-diff\-tree \-r <tree\-ish> <tree\-ish> kernel/sched\&.c
213 and it will ignore all differences to other files\&.
216 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\&.
219 An example of normal usage is:
222 torvalds@ppc970:~/git> git\-diff\-tree 5319e4\&.\&.\&.\&.\&.\&.
223 *100664\->100664 blob ac348b\&.\&.\&.\&.\&.\&.\&.\->a01513\&.\&.\&.\&.\&.\&.\&. git\-fsck\-objects\&.c
227 which tells you that the last commit changed just one file (it's from this one:
230 commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
231 tree 5319e4d609cdd282069cc4dce33c1db559539b03
232 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
233 author Linus Torvalds <torvalds@ppc970\&.osdl\&.org> Sat Apr 9 12:02:30 2005
234 committer Linus Torvalds <torvalds@ppc970\&.osdl\&.org> Sat Apr 9 12:02:30 2005
236 Make "git\-fsck\-objects" print out all the root commits it finds\&.
238 Once I do the reference tracking, I'll also make it print out all the
239 HEAD commits it finds, which is even more interesting\&.
248 The output format from "git\-diff\-index", "git\-diff\-tree" and "git\-diff\-files" are very similar\&.
251 These commands all compare two sets of things; what is compared differs:
254 git\-diff\-index <tree\-ish>
255 compares the <tree\-ish> and the files on the filesystem\&.
258 git\-diff\-index \-\-cached <tree\-ish>
259 compares the <tree\-ish> and the index\&.
262 git\-diff\-tree [\-r] <tree\-ish\-1> <tree\-ish\-2> [<pattern>...]
263 compares the trees named by the two arguments\&.
266 git\-diff\-files [<pattern>...]
267 compares the index and the files on the filesystem\&.
270 An output line is formatted this way:
273 in\-place edit :100644 100644 bcd1234\&.\&.\&. 0123456\&.\&.\&. M file0
274 copy\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. C68 file1 file2
275 rename\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. R86 file1 file3
276 create :000000 100644 0000000\&.\&.\&. 1234567\&.\&.\&. A file4
277 delete :100644 000000 1234567\&.\&.\&. 0000000\&.\&.\&. D file5
278 unmerged :000000 000000 0000000\&.\&.\&. 0000000\&.\&.\&. U file6
282 That is, from the left to the right:
289 mode for "src"; 000000 if creation or unmerged\&.
295 mode for "dst"; 000000 if deletion or unmerged\&.
301 sha1 for "src"; 0{40} if creation or unmerged\&.
307 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree"\&.
313 status, followed by optional "score" number\&.
316 a tab or a NUL when \fI\-z\fR option is used\&.
322 a tab or a NUL when \fI\-z\fR option is used; only exists for C or R\&.
325 path for "dst"; only exists for C or R\&.
328 an LF or a NUL when \fI\-z\fR option is used, to terminate the record\&.
332 <sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index\&.
338 :100644 100644 5be4a4\&.\&.\&.\&.\&.\&. 000000\&.\&.\&.\&.\&.\&. M file\&.c
342 When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
344 .SH "GENERATING PATCHES WITH -P"
347 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\&.
350 The patch generation can be customized at two levels\&.
354 When the environment variable \fIGIT_EXTERNAL_DIFF\fR is not set, these commands internally invoke "diff" like this:
358 diff \-L a/<path> \-L b/<path> \-pu <old> <new>
360 For added files, /dev/null is used for <old>\&. For removed files, /dev/null is used for <new>
362 The "diff" formatting options can be customized via the environment variable \fIGIT_DIFF_OPTS\fR\&. For example, if you prefer context diff:
365 GIT_DIFF_OPTS=\-c git\-diff\-index \-p HEAD
369 When the environment variable \fIGIT_EXTERNAL_DIFF\fR is set, the program named by it is called, instead of the diff invocation described above\&.
371 For a path that is added, removed, or modified, \fIGIT_EXTERNAL_DIFF\fR is called with 7 parameters:
375 path old\-file old\-hex old\-mode new\-file new\-hex new\-mode
381 are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,
385 are the 40\-hexdigit SHA1 hashes,
389 are the octal representation of the file modes\&.
391 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\&.
395 For a path that is unmerged, \fIGIT_EXTERNAL_DIFF\fR is called with 1 parameter, <path>\&.
397 .SH "GIT SPECIFIC EXTENSION TO DIFF FORMAT"
400 What \-p option produces is slightly different from the traditional diff format\&.
404 It is preceded with a "git diff" header, that looks like this:
408 diff \-\-git a/file1 b/file2
410 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\&.
412 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\&.
415 It is followed by one or more extended header lines:
420 deleted file mode <mode>
426 similarity index <number>
427 dissimilarity index <number>
428 index <hash>\&.\&.<hash> <mode>
432 TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
435 .SH "COMBINED DIFF FORMAT"
438 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:
441 diff \-\-combined describe\&.c
443 return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
446 \- static void describe(char *arg)
447 \-static void describe(struct commit *cmit, int last_one)
448 ++static void describe(char *arg, int last_one)
450 + unsigned char sha1[20];
451 + struct commit *cmit;
455 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\&.
458 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\&.
461 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 +)\&.
464 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")\&.
469 Written by Linus Torvalds <torvalds@osdl\&.org>
474 Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
479 Part of the \fBgit\fR(7) suite