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.2" />
\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 Generate patch but keep also the default raw diff output.
\r
319 Generate a diffstat instead of a patch.
\r
327 Output a condensed summary of extended header information
\r
328 such as creations, renames and mode changes.
\r
336 Generate patch and prepend its diffstat.
\r
344 \0 line termination on output
\r
352 Show only names of changed files.
\r
360 Show only names and status of changed files.
\r
368 Instead of the first handful characters, show full
\r
369 object name of pre- and post-image blob on the "index"
\r
370 line when generating a patch format output.
\r
374 --abbrev[=<n>]
\r
378 Instead of showing the full 40-byte hexadecimal object
\r
379 name in diff-raw format output and diff-tree header
\r
380 lines, show only handful hexdigits prefix. This is
\r
381 independent of --full-index option above, which controls
\r
382 the diff-patch output format. Non default number of
\r
383 digits can be specified with --abbrev=<n>.
\r
391 Break complete rewrite changes into pairs of delete and create.
\r
407 Detect copies as well as renames.
\r
411 --diff-filter=[ACDMRTUXB*]
\r
415 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
\r
416 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
\r
417 type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
\r
418 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
\r
419 Any combination of the filter characters may be used.
\r
420 When <tt>*</tt> (All-or-none) is added to the combination, all
\r
421 paths are selected if there is any file that matches
\r
422 other criteria in the comparison; if there is no file
\r
423 that matches other criteria, nothing is selected.
\r
427 --find-copies-harder
\r
431 For performance reasons, by default, -C option finds copies only
\r
432 if the original file of the copy was modified in the same
\r
433 changeset. This flag makes the command
\r
434 inspect unmodified files as candidates for the source of
\r
435 copy. This is a very expensive operation for large
\r
436 projects, so use it with caution.
\r
444 -M and -C options require O(n^2) processing time where n
\r
445 is the number of potential rename/copy targets. This
\r
446 option prevents rename/copy detection from running if
\r
447 the number of rename/copy targets exceeds the specified
\r
456 Look for differences that contain the change in <string>.
\r
464 When -S finds a change, show all the changes in that
\r
465 changeset, not just the files that contain the change
\r
474 Make the <string> not a plain string but an extended POSIX
\r
479 -O<orderfile>
\r
483 Output the patch in the order specified in the
\r
484 <orderfile>, which has one shell glob pattern per line.
\r
492 Swap two inputs; that is, show differences from index or
\r
493 on-disk file to tree contents.
\r
497 <p>For more detailed explanation on these common options, see also
\r
498 <a href="diffcore.html">diffcore documentation</a>.</p>
\r
505 The id of a tree object.
\r
509 <path>…
\r
513 If provided, the results are limited to a subset of files
\r
514 matching one of these prefix strings.
\r
515 ie file matches <tt>/^<pattern1>|<pattern2>|…/</tt>
\r
516 Note that this parameter does not provide any wildcard or regexp
\r
525 recurse into sub-trees
\r
533 show tree entry itself as well as subtrees. Implies -r.
\r
541 When <em>--root</em> is specified the initial commit will be showed as a big
\r
542 creation event. This is equivalent to a diff against the NULL tree.
\r
550 When <em>--stdin</em> is specified, the command does not take
\r
551 <tree-ish> arguments from the command line. Instead, it
\r
552 reads either one <commit> or a pair of <tree-ish>
\r
553 separated with a single space from its standard input.
\r
555 <p>When a single commit is given on one line of such input, it compares
\r
556 the commit with its parents. The following flags further affects its
\r
557 behaviour. This does not apply to the case where two <tree-ish>
\r
558 separated with a single space are given.</p>
\r
565 By default, "git-diff-tree --stdin" does not show
\r
566 differences for merge commits. With this flag, it shows
\r
567 differences to that commit from all of its parents. See
\r
576 By default, "git-diff-tree --stdin" shows differences,
\r
577 either in machine-readable form (without <em>-p</em>) or in patch
\r
578 form (with <em>-p</em>). This output can be suppressed. It is
\r
579 only useful with <em>-v</em> flag.
\r
587 This flag causes "git-diff-tree --stdin" to also show
\r
588 the commit message before the differences.
\r
592 --pretty[=(raw|medium|short)]
\r
596 This is used to control "pretty printing" format of the
\r
597 commit message. Without "=<style>", it defaults to
\r
606 git-diff-tree outputs a line with the commit ID when
\r
607 applicable. This flag suppressed the commit ID output.
\r
615 This flag changes the way a merge commit is displayed
\r
616 (which means it is useful only when the command is given
\r
617 one <tree-ish>, or <em>--stdin</em>). It shows the differences
\r
618 from each of the parents to the merge result simultaneously
\r
619 instead of showing pairwise diff between a parent and the
\r
620 result one at a time (which is what the <em>-m</em> option does).
\r
621 Furthermore, it lists only files which were modified
\r
630 This flag changes the way a merge commit patch is displayed,
\r
631 in a similar way to the <em>-c</em> option. It implies the <em>-c</em>
\r
632 and <em>-p</em> options and further compresses the patch output
\r
633 by omitting hunks that show differences from only one
\r
634 parent, or show the same change from all but one parent
\r
635 for an Octopus merge. When this optimization makes all
\r
636 hunks disappear, the commit itself and the commit log
\r
637 message is not shown, just like in any other "empty diff" case.
\r
645 Show the commit itself and the commit log message even
\r
646 if the diff itself is empty.
\r
651 <h2>Limiting Output</h2>
\r
652 <div class="sectionbody">
\r
653 <p>If you're only interested in differences in a subset of files, for
\r
654 example some architecture-specific files, you might do:</p>
\r
655 <div class="literalblock">
\r
656 <div class="content">
\r
657 <pre><tt>git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre>
\r
659 <p>and it will only show you what changed in those two directories.</p>
\r
660 <p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p>
\r
661 <div class="literalblock">
\r
662 <div class="content">
\r
663 <pre><tt>git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
\r
665 <p>and it will ignore all differences to other files.</p>
\r
666 <p>The pattern is always the prefix, and is matched exactly. There are no
\r
667 wildcards. Even stricter, it has to match a complete path component.
\r
668 I.e. "foo" does not pick up <tt>foobar.h</tt>. "foo" does match <tt>foo/bar.h</tt>
\r
669 so it can be used to name subdirectories.</p>
\r
670 <p>An example of normal usage is:</p>
\r
671 <div class="literalblock">
\r
672 <div class="content">
\r
673 <pre><tt>torvalds@ppc970:~/git> git-diff-tree 5319e4......
\r
674 *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c</tt></pre>
\r
676 <p>which tells you that the last commit changed just one file (it's from
\r
678 <div class="listingblock">
\r
679 <div class="content">
\r
680 <pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
\r
681 tree 5319e4d609cdd282069cc4dce33c1db559539b03
\r
682 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
\r
683 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
\r
684 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
\r
686 Make "git-fsck-objects" print out all the root commits it finds.
\r
688 Once I do the reference tracking, I'll also make it print out all the
\r
689 HEAD commits it finds, which is even more interesting.</tt></pre>
\r
691 <p>in case you care).</p>
\r
693 <h2>Output format</h2>
\r
694 <div class="sectionbody">
\r
695 <p>The output format from "git-diff-index", "git-diff-tree" and
\r
696 "git-diff-files" are very similar.</p>
\r
697 <p>These commands all compare two sets of things; what is
\r
698 compared differs:</p>
\r
701 git-diff-index <tree-ish>
\r
705 compares the <tree-ish> and the files on the filesystem.
\r
709 git-diff-index --cached <tree-ish>
\r
713 compares the <tree-ish> and the index.
\r
717 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
\r
721 compares the trees named by the two arguments.
\r
725 git-diff-files [<pattern>…]
\r
729 compares the index and the files on the filesystem.
\r
733 <p>An output line is formatted this way:</p>
\r
734 <div class="listingblock">
\r
735 <div class="content">
\r
736 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
\r
737 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
\r
738 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
\r
739 create :000000 100644 0000000... 1234567... A file4
\r
740 delete :100644 000000 1234567... 0000000... D file5
\r
741 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
\r
743 <p>That is, from the left to the right:</p>
\r
752 mode for "src"; 000000 if creation or unmerged.
\r
762 mode for "dst"; 000000 if deletion or unmerged.
\r
772 sha1 for "src"; 0{40} if creation or unmerged.
\r
782 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
\r
792 status, followed by optional "score" number.
\r
797 a tab or a NUL when <em>-z</em> option is used.
\r
807 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
\r
812 path for "dst"; only exists for C or R.
\r
817 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
\r
821 <p><sha1> is shown as all 0's if a file is new on the filesystem
\r
822 and it is out of sync with the index.</p>
\r
824 <div class="listingblock">
\r
825 <div class="content">
\r
826 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
\r
828 <p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
\r
829 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
832 <h2>Generating patches with -p</h2>
\r
833 <div class="sectionbody">
\r
834 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
\r
835 with a <em>-p</em> option, they do not produce the output described above;
\r
836 instead they produce a patch file.</p>
\r
837 <p>The patch generation can be customized at two levels.</p>
\r
841 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is not set,
\r
842 these commands internally invoke "diff" like this:
\r
844 <div class="literalblock">
\r
845 <div class="content">
\r
846 <pre><tt>diff -L a/<path> -L b/<path> -pu <old> <new></tt></pre>
\r
848 <p>For added files, <tt>/dev/null</tt> is used for <old>. For removed
\r
849 files, <tt>/dev/null</tt> is used for <new></p>
\r
850 <p>The "diff" formatting options can be customized via the
\r
851 environment variable <em>GIT_DIFF_OPTS</em>. For example, if you
\r
852 prefer context diff:</p>
\r
853 <div class="literalblock">
\r
854 <div class="content">
\r
855 <pre><tt>GIT_DIFF_OPTS=-c git-diff-index -p HEAD</tt></pre>
\r
860 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is set, the
\r
861 program named by it is called, instead of the diff invocation
\r
864 <p>For a path that is added, removed, or modified,
\r
865 <em>GIT_EXTERNAL_DIFF</em> is called with 7 parameters:</p>
\r
866 <div class="literalblock">
\r
867 <div class="content">
\r
868 <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
\r
871 <div class="hlist"><table>
\r
873 <td class="hlist1">
\r
874 <old|new>-file
\r
876 <td class="hlist2">
\r
877 are files GIT_EXTERNAL_DIFF can use to read the
\r
878 contents of <old|new>,
\r
882 <td class="hlist1">
\r
883 <old|new>-hex
\r
885 <td class="hlist2">
\r
886 are the 40-hexdigit SHA1 hashes,
\r
890 <td class="hlist1">
\r
891 <old|new>-mode
\r
893 <td class="hlist2">
\r
894 are the octal representation of the file modes.
\r
898 <p>The file parameters can point at the user's working file
\r
899 (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
\r
900 when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
\r
901 index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
\r
902 temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p>
\r
905 <p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
\r
906 parameter, <path>.</p>
\r
908 <h2>git specific extension to diff format</h2>
\r
909 <div class="sectionbody">
\r
910 <p>What -p option produces is slightly different from the
\r
911 traditional diff format.</p>
\r
915 It is preceded with a "git diff" header, that looks like
\r
918 <div class="literalblock">
\r
919 <div class="content">
\r
920 <pre><tt>diff --git a/file1 b/file2</tt></pre>
\r
922 <p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
\r
923 involved. Especially, even for a creation or a deletion,
\r
924 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
\r
925 <p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
\r
926 name of the source file of the rename/copy and the name of
\r
927 the file that rename/copy produces, respectively.</p>
\r
931 It is followed by one or more extended header lines:
\r
933 <div class="literalblock">
\r
934 <div class="content">
\r
935 <pre><tt>old mode <mode>
\r
936 new mode <mode>
\r
937 deleted file mode <mode>
\r
938 new file mode <mode>
\r
939 copy from <path>
\r
940 copy to <path>
\r
941 rename from <path>
\r
942 rename to <path>
\r
943 similarity index <number>
\r
944 dissimilarity index <number>
\r
945 index <hash>..<hash> <mode></tt></pre>
\r
950 TAB, LF, and backslash characters in pathnames are
\r
951 represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.
\r
956 <h2>combined diff format</h2>
\r
957 <div class="sectionbody">
\r
958 <p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option
\r
959 to produce <em>combined diff</em>, which looks like this:</p>
\r
960 <div class="listingblock">
\r
961 <div class="content">
\r
962 <pre><tt>diff --combined describe.c
\r
964 return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
\r
967 - static void describe(char *arg)
\r
968 -static void describe(struct commit *cmit, int last_one)
\r
969 ++static void describe(char *arg, int last_one)
\r
971 + unsigned char sha1[20];
\r
972 + struct commit *cmit;</tt></pre>
\r
974 <p>Unlike the traditional <em>unified</em> diff format, which shows two
\r
975 files A and B with a single column that has <tt>-</tt> (minus —
\r
976 appears in A but removed in B), <tt>+</tt> (plus — missing in A but
\r
977 added to B), or <tt> </tt> (space — unchanged) prefix, this format
\r
978 compares two or more files file1, file2,… with one file X, and
\r
979 shows how X differs from each of fileN. One column for each of
\r
980 fileN is prepended to the output line to note how X's line is
\r
981 different from it.</p>
\r
982 <p>A <tt>-</tt> character in the column N means that the line appears in
\r
983 fileN but it does not appear in the last file. A <tt>+</tt> character
\r
984 in the column N means that the line appears in the last file,
\r
985 and fileN does not have that line.</p>
\r
986 <p>In the above example output, the function signature was changed
\r
987 from both files (hence two <tt>-</tt> removals from both file1 and
\r
988 file2, plus <tt>++</tt> to mean one line that was added does not appear
\r
989 in either file1 nor file2). Also two other lines are the same
\r
990 from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
\r
991 <p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
\r
992 merge commit with the merge result (i.e. file1..fileN are the
\r
993 parents). When shown by <tt>git diff-files -c</tt>, it compares the
\r
994 two unresolved merge parents with the working tree file
\r
995 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
\r
996 "their version").</p>
\r
999 <div class="sectionbody">
\r
1000 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
1002 <h2>Documentation</h2>
\r
1003 <div class="sectionbody">
\r
1004 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
1007 <div class="sectionbody">
\r
1008 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
1011 <div id="footer-text">
\r
1012 Last updated 17-May-2006 10:34:02 UTC
\r
projects / git.git / blob