1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-diff-tree(1)</title>
\r
264 git-diff-tree(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Compares the content and mode of blobs found via two tree objects
\r
274 <div class="sectionbody">
\r
275 <div class="verseblock">
\r
276 <div class="content"><em>git-diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
\r
277 [-t] [-r] [-c | --cc] [--root] [<common diff options>]
\r
278 <tree-ish> [<tree-ish>] [<path>…]</div></div>
\r
280 <h2>DESCRIPTION</h2>
\r
281 <div class="sectionbody">
\r
282 <p>Compares the content and mode of the blobs found via two tree objects.</p>
\r
283 <p>If there is only one <tree-ish> given, the commit is compared with its parents
\r
284 (see --stdin below).</p>
\r
285 <p>Note that "git-diff-tree" can use the tree encapsulated in a commit object.</p>
\r
288 <div class="sectionbody">
\r
295 Generate patch (see section on generating patches)
\r
311 \0 line termination on output
\r
319 Show only names of changed files.
\r
327 Show only names and status of changed files.
\r
335 Instead of the first handful characters, show full
\r
336 object name of pre- and post-image blob on the "index"
\r
337 line when generating a patch format output.
\r
341 --abbrev[=<n>]
\r
345 Instead of showing the full 40-byte hexadecimal object
\r
346 name in diff-raw format output and diff-tree header
\r
347 lines, show only handful hexdigits prefix. This is
\r
348 independent of --full-index option above, which controls
\r
349 the diff-patch output format. Non default number of
\r
350 digits can be specified with --abbrev=<n>.
\r
358 Break complete rewrite changes into pairs of delete and create.
\r
374 Detect copies as well as renames.
\r
378 --find-copies-harder
\r
382 For performance reasons, by default, -C option finds copies only
\r
383 if the original file of the copy was modified in the same
\r
384 changeset. This flag makes the command
\r
385 inspect unmodified files as candidates for the source of
\r
386 copy. This is a very expensive operation for large
\r
387 projects, so use it with caution.
\r
395 -M and -C options require O(n^2) processing time where n
\r
396 is the number of potential rename/copy targets. This
\r
397 option prevents rename/copy detection from running if
\r
398 the number of rename/copy targets exceeds the specified
\r
407 Look for differences that contain the change in <string>.
\r
415 When -S finds a change, show all the changes in that
\r
416 changeset, not just the files that contain the change
\r
421 -O<orderfile>
\r
425 Output the patch in the order specified in the
\r
426 <orderfile>, which has one shell glob pattern per line.
\r
434 Swap two inputs; that is, show differences from index or
\r
435 on-disk file to tree contents.
\r
439 <p>For more detailed explanation on these common options, see also
\r
440 <a href="diffcore.html">diffcore documentation</a>.</p>
\r
447 The id of a tree object.
\r
451 <path>…
\r
455 If provided, the results are limited to a subset of files
\r
456 matching one of these prefix strings.
\r
457 ie file matches <tt>/^<pattern1>|<pattern2>|…/</tt>
\r
458 Note that this parameter does not provide any wildcard or regexp
\r
467 recurse into sub-trees
\r
475 show tree entry itself as well as subtrees. Implies -r.
\r
483 When <em>--root</em> is specified the initial commit will be showed as a big
\r
484 creation event. This is equivalent to a diff against the NULL tree.
\r
492 When <em>--stdin</em> is specified, the command does not take
\r
493 <tree-ish> arguments from the command line. Instead, it
\r
494 reads either one <commit> or a pair of <tree-ish>
\r
495 separated with a single space from its standard input.
\r
497 <p>When a single commit is given on one line of such input, it compares
\r
498 the commit with its parents. The following flags further affects its
\r
499 behaviour. This does not apply to the case where two <tree-ish>
\r
500 separated with a single space are given.</p>
\r
507 By default, "git-diff-tree --stdin" does not show
\r
508 differences for merge commits. With this flag, it shows
\r
509 differences to that commit from all of its parents.
\r
517 By default, "git-diff-tree --stdin" shows differences,
\r
518 either in machine-readable form (without <em>-p</em>) or in patch
\r
519 form (with <em>-p</em>). This output can be suppressed. It is
\r
520 only useful with <em>-v</em> flag.
\r
528 This flag causes "git-diff-tree --stdin" to also show
\r
529 the commit message before the differences.
\r
533 --pretty[=(raw|medium|short)]
\r
537 This is used to control "pretty printing" format of the
\r
538 commit message. Without "=<style>", it defaults to
\r
547 git-diff-tree outputs a line with the commit ID when
\r
548 applicable. This flag suppressed the commit ID output.
\r
556 These flags change the way a merge commit is displayed
\r
557 (which means it is useful only when the command is given
\r
558 one <tree-ish>, or <em>--stdin</em>). It shows the differences
\r
559 from each of the parents to the merge result
\r
560 simultaneously, instead of showing pairwise diff between
\r
561 a parent and the result one at a time, which <em>-m</em> option
\r
562 output does. <em>--cc</em> further compresses the output by
\r
563 omiting hunks that show differences from only one
\r
564 parent, or show the same change from all but one parent
\r
565 for an Octopus merge. When this optimization makes all
\r
566 hunks disappear, the commit itself and the commit log
\r
567 message is not shown, just like any other "empty diff" cases.
\r
572 <h2>Limiting Output</h2>
\r
573 <div class="sectionbody">
\r
574 <p>If you're only interested in differences in a subset of files, for
\r
575 example some architecture-specific files, you might do:</p>
\r
576 <div class="literalblock">
\r
577 <div class="content">
\r
578 <pre><tt>git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre>
\r
580 <p>and it will only show you what changed in those two directories.</p>
\r
581 <p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p>
\r
582 <div class="literalblock">
\r
583 <div class="content">
\r
584 <pre><tt>git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
\r
586 <p>and it will ignore all differences to other files.</p>
\r
587 <p>The pattern is always the prefix, and is matched exactly. There are no
\r
588 wildcards. Even stricter, it has to match a complete path component.
\r
589 I.e. "foo" does not pick up <tt>foobar.h</tt>. "foo" does match <tt>foo/bar.h</tt>
\r
590 so it can be used to name subdirectories.</p>
\r
591 <p>An example of normal usage is:</p>
\r
592 <div class="literalblock">
\r
593 <div class="content">
\r
594 <pre><tt>torvalds@ppc970:~/git> git-diff-tree 5319e4......
\r
595 *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c</tt></pre>
\r
597 <p>which tells you that the last commit changed just one file (it's from
\r
599 <div class="listingblock">
\r
600 <div class="content">
\r
601 <pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
\r
602 tree 5319e4d609cdd282069cc4dce33c1db559539b03
\r
603 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
\r
604 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
\r
605 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
\r
607 Make "git-fsck-objects" print out all the root commits it finds.
\r
609 Once I do the reference tracking, I'll also make it print out all the
\r
610 HEAD commits it finds, which is even more interesting.</tt></pre>
\r
612 <p>in case you care).</p>
\r
614 <h2>Output format</h2>
\r
615 <div class="sectionbody">
\r
616 <p>The output format from "git-diff-index", "git-diff-tree" and
\r
617 "git-diff-files" are very similar.</p>
\r
618 <p>These commands all compare two sets of things; what is
\r
619 compared differs:</p>
\r
622 git-diff-index <tree-ish>
\r
626 compares the <tree-ish> and the files on the filesystem.
\r
630 git-diff-index --cached <tree-ish>
\r
634 compares the <tree-ish> and the index.
\r
638 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
\r
642 compares the trees named by the two arguments.
\r
646 git-diff-files [<pattern>…]
\r
650 compares the index and the files on the filesystem.
\r
654 <p>An output line is formatted this way:</p>
\r
655 <div class="listingblock">
\r
656 <div class="content">
\r
657 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
\r
658 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
\r
659 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
\r
660 create :000000 100644 0000000... 1234567... A file4
\r
661 delete :100644 000000 1234567... 0000000... D file5
\r
662 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
\r
664 <p>That is, from the left to the right:</p>
\r
673 mode for "src"; 000000 if creation or unmerged.
\r
683 mode for "dst"; 000000 if deletion or unmerged.
\r
693 sha1 for "src"; 0{40} if creation or unmerged.
\r
703 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
\r
713 status, followed by optional "score" number.
\r
718 a tab or a NUL when <em>-z</em> option is used.
\r
728 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
\r
733 path for "dst"; only exists for C or R.
\r
738 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
\r
742 <p><sha1> is shown as all 0's if a file is new on the filesystem
\r
743 and it is out of sync with the index.</p>
\r
745 <div class="listingblock">
\r
746 <div class="content">
\r
747 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
\r
749 <p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
\r
750 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
753 <h2>Generating patches with -p</h2>
\r
754 <div class="sectionbody">
\r
755 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
\r
756 with a <em>-p</em> option, they do not produce the output described above;
\r
757 instead they produce a patch file.</p>
\r
758 <p>The patch generation can be customized at two levels.</p>
\r
762 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is not set,
\r
763 these commands internally invoke "diff" like this:
\r
765 <div class="literalblock">
\r
766 <div class="content">
\r
767 <pre><tt>diff -L a/<path> -L b/<path> -pu <old> <new></tt></pre>
\r
769 <p>For added files, <tt>/dev/null</tt> is used for <old>. For removed
\r
770 files, <tt>/dev/null</tt> is used for <new></p>
\r
771 <p>The "diff" formatting options can be customized via the
\r
772 environment variable <em>GIT_DIFF_OPTS</em>. For example, if you
\r
773 prefer context diff:</p>
\r
774 <div class="literalblock">
\r
775 <div class="content">
\r
776 <pre><tt>GIT_DIFF_OPTS=-c git-diff-index -p HEAD</tt></pre>
\r
781 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is set, the
\r
782 program named by it is called, instead of the diff invocation
\r
785 <p>For a path that is added, removed, or modified,
\r
786 <em>GIT_EXTERNAL_DIFF</em> is called with 7 parameters:</p>
\r
787 <div class="literalblock">
\r
788 <div class="content">
\r
789 <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
\r
792 <div class="hlist"><table>
\r
794 <td class="hlist1">
\r
795 <old|new>-file
\r
797 <td class="hlist2">
\r
798 are files GIT_EXTERNAL_DIFF can use to read the
\r
799 contents of <old|new>,
\r
803 <td class="hlist1">
\r
804 <old|new>-hex
\r
806 <td class="hlist2">
\r
807 are the 40-hexdigit SHA1 hashes,
\r
811 <td class="hlist1">
\r
812 <old|new>-mode
\r
814 <td class="hlist2">
\r
815 are the octal representation of the file modes.
\r
819 <p>The file parameters can point at the user's working file
\r
820 (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
\r
821 when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
\r
822 index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
\r
823 temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p>
\r
826 <p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
\r
827 parameter, <path>.</p>
\r
829 <h2>git specific extension to diff format</h2>
\r
830 <div class="sectionbody">
\r
831 <p>What -p option produces is slightly different from the
\r
832 traditional diff format.</p>
\r
836 It is preceded with a "git diff" header, that looks like
\r
839 <div class="literalblock">
\r
840 <div class="content">
\r
841 <pre><tt>diff --git a/file1 b/file2</tt></pre>
\r
843 <p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
\r
844 involved. Especially, even for a creation or a deletion,
\r
845 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
\r
846 <p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
\r
847 name of the source file of the rename/copy and the name of
\r
848 the file that rename/copy produces, respectively.</p>
\r
852 It is followed by one or more extended header lines:
\r
854 <div class="literalblock">
\r
855 <div class="content">
\r
856 <pre><tt>old mode <mode>
\r
857 new mode <mode>
\r
858 deleted file mode <mode>
\r
859 new file mode <mode>
\r
860 copy from <path>
\r
861 copy to <path>
\r
862 rename from <path>
\r
863 rename to <path>
\r
864 similarity index <number>
\r
865 dissimilarity index <number>
\r
866 index <hash>..<hash> <mode></tt></pre>
\r
871 TAB, LF, and backslash characters in pathnames are
\r
872 represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.
\r
877 <h2>combined diff format</h2>
\r
878 <div class="sectionbody">
\r
879 <p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option
\r
880 to produce <em>combined diff</em>, which looks like this:</p>
\r
881 <div class="listingblock">
\r
882 <div class="content">
\r
883 <pre><tt>diff --combined describe.c
\r
885 return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
\r
888 - static void describe(char *arg)
\r
889 -static void describe(struct commit *cmit, int last_one)
\r
890 ++static void describe(char *arg, int last_one)
\r
892 + unsigned char sha1[20];
\r
893 + struct commit *cmit;</tt></pre>
\r
895 <p>Unlike the traditional <em>unified</em> diff format, which shows two
\r
896 files A and B with a single column that has <tt>-</tt> (minus —
\r
897 appears in A but removed in B), <tt>+</tt> (plus — missing in A but
\r
898 added to B), or <tt> </tt> (space — unchanged) prefix, this format
\r
899 compares two or more files file1, file2,… with one file X, and
\r
900 shows how X differs from each of fileN. One column for each of
\r
901 fileN is prepended to the output line to note how X's line is
\r
902 different from it.</p>
\r
903 <p>A <tt>-</tt> character in the column N means that the line appears in
\r
904 fileN but it does not appear in the last file. A <tt>+</tt> character
\r
905 in the column N means that the line appears in the last file,
\r
906 and fileN does not have that line.</p>
\r
907 <p>In the above example output, the function signature was changed
\r
908 from both files (hence two <tt>-</tt> removals from both file1 and
\r
909 file2, plus <tt>++</tt> to mean one line that was added does not appear
\r
910 in either file1 nor file2). Also two other lines are the same
\r
911 from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
\r
912 <p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
\r
913 merge commit with the merge result (i.e. file1..fileN are the
\r
914 parents). When shown by <tt>git diff-files -c</tt>, it compares the
\r
915 two unresolved merge parents with the working tree file
\r
916 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
\r
917 "their version").</p>
\r
920 <div class="sectionbody">
\r
921 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
923 <h2>Documentation</h2>
\r
924 <div class="sectionbody">
\r
925 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
928 <div class="sectionbody">
\r
929 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
932 <div id="footer-text">
\r
933 Last updated 02-Feb-2006 15:49:55 PDT
\r
projects / git.git / blob