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 <p><em>git-diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>…]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Compares the content and mode of the blobs found via two tree objects.</p>
\r
280 <p>If there is only one <tree-ish> given, the commit is compared with its parents
\r
281 (see --stdin below).</p>
\r
282 <p>Note that "git-diff-tree" can use the tree encapsulated in a commit object.</p>
\r
285 <div class="sectionbody">
\r
292 Generate patch (see section on generating patches)
\r
308 \0 line termination on output
\r
316 Show only names of changed files.
\r
324 Show only names and status of changed files.
\r
332 Instead of the first handful characters, show full
\r
333 object name of pre- and post-image blob on the "index"
\r
334 line when generating a patch format output.
\r
338 --abbrev[=<n>]
\r
342 Instead of showing the full 40-byte hexadecimal object
\r
343 name in diff-raw format output and diff-tree header
\r
344 lines, show only handful dhexigits prefix. This is
\r
345 independent of --full-index option above, which controls
\r
346 the diff-patch output format. Non default number of
\r
347 digits can be specified with --abbrev=<n>.
\r
355 Break complete rewrite changes into pairs of delete and create.
\r
371 Detect copies as well as renames.
\r
375 --find-copies-harder
\r
379 For performance reasons, by default, -C option finds copies only
\r
380 if the original file of the copy was modified in the same
\r
381 changeset. This flag makes the command
\r
382 inspect unmodified files as candidates for the source of
\r
383 copy. This is a very expensive operation for large
\r
384 projects, so use it with caution.
\r
392 -M and -C options require O(n^2) processing time where n
\r
393 is the number of potential rename/copy targets. This
\r
394 option prevents rename/copy detection from running if
\r
395 the number of rename/copy targets exceeds the specified
\r
404 Look for differences that contain the change in <string>.
\r
412 When -S finds a change, show all the changes in that
\r
413 changeset, not just the files that contain the change
\r
418 -O<orderfile>
\r
422 Output the patch in the order specified in the
\r
423 <orderfile>, which has one shell glob pattern per line.
\r
431 Swap two inputs; that is, show differences from index or
\r
432 on-disk file to tree contents.
\r
436 <p>For more detailed explanation on these common options, see also
\r
437 <a href="diffcore.html">diffcore documentation</a>.</p>
\r
444 The id of a tree object.
\r
448 <path>…
\r
452 If provided, the results are limited to a subset of files
\r
453 matching one of these prefix strings.
\r
454 ie file matches <tt>/^<pattern1>|<pattern2>|…/</tt>
\r
455 Note that this parameter does not provide any wildcard or regexp
\r
464 recurse into sub-trees
\r
472 show tree entry itself as well as subtrees. Implies -r.
\r
480 When <em>--root</em> is specified the initial commit will be showed as a big
\r
481 creation event. This is equivalent to a diff against the NULL tree.
\r
489 When <em>--stdin</em> is specified, the command does not take
\r
490 <tree-ish> arguments from the command line. Instead, it
\r
491 reads either one <commit> or a pair of <tree-ish>
\r
492 separated with a single space from its standard input.
\r
494 <p>When a single commit is given on one line of such input, it compares
\r
495 the commit with its parents. The following flags further affects its
\r
496 behaviour. This does not apply to the case where two <tree-ish>
\r
497 separated with a single space are given.</p>
\r
504 By default, "git-diff-tree --stdin" does not show
\r
505 differences for merge commits. With this flag, it shows
\r
506 differences to that commit from all of its parents.
\r
514 By default, "git-diff-tree --stdin" shows differences,
\r
515 either in machine-readable form (without <em>-p</em>) or in patch
\r
516 form (with <em>-p</em>). This output can be supressed. It is
\r
517 only useful with <em>-v</em> flag.
\r
525 This flag causes "git-diff-tree --stdin" to also show
\r
526 the commit message before the differences.
\r
530 --pretty[=(raw|medium|short)]
\r
534 This is used to control "pretty printing" format of the
\r
535 commit message. Without "=<style>", it defaults to
\r
544 git-diff-tree outputs a line with the commit ID when
\r
545 applicable. This flag suppressed the commit ID output.
\r
550 <h2>Limiting Output</h2>
\r
551 <div class="sectionbody">
\r
552 <p>If you're only interested in differences in a subset of files, for
\r
553 example some architecture-specific files, you might do:</p>
\r
554 <div class="literalblock">
\r
555 <div class="content">
\r
556 <pre><tt>git-diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre>
\r
558 <p>and it will only show you what changed in those two directories.</p>
\r
559 <p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p>
\r
560 <div class="literalblock">
\r
561 <div class="content">
\r
562 <pre><tt>git-diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
\r
564 <p>and it will ignore all differences to other files.</p>
\r
565 <p>The pattern is always the prefix, and is matched exactly. There are no
\r
566 wildcards. Even stricter, it has to match a complete path component.
\r
567 I.e. "foo" does not pick up <tt>foobar.h</tt>. "foo" does match <tt>foo/bar.h</tt>
\r
568 so it can be used to name subdirectories.</p>
\r
569 <p>An example of normal usage is:</p>
\r
570 <div class="literalblock">
\r
571 <div class="content">
\r
572 <pre><tt>torvalds@ppc970:~/git> git-diff-tree 5319e4......
\r
573 *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c</tt></pre>
\r
575 <p>which tells you that the last commit changed just one file (it's from
\r
577 <div class="listingblock">
\r
578 <div class="content">
\r
579 <pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
\r
580 tree 5319e4d609cdd282069cc4dce33c1db559539b03
\r
581 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
\r
582 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
\r
583 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
\r
585 Make "git-fsck-objects" print out all the root commits it finds.
\r
587 Once I do the reference tracking, I'll also make it print out all the
\r
588 HEAD commits it finds, which is even more interesting.</tt></pre>
\r
590 <p>in case you care).</p>
\r
592 <h2>Output format</h2>
\r
593 <div class="sectionbody">
\r
594 <p>The output format from "git-diff-index", "git-diff-tree" and
\r
595 "git-diff-files" are very similar.</p>
\r
596 <p>These commands all compare two sets of things; what is
\r
597 compared differs:</p>
\r
600 git-diff-index <tree-ish>
\r
604 compares the <tree-ish> and the files on the filesystem.
\r
608 git-diff-index --cached <tree-ish>
\r
612 compares the <tree-ish> and the index.
\r
616 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
\r
620 compares the trees named by the two arguments.
\r
624 git-diff-files [<pattern>…]
\r
628 compares the index and the files on the filesystem.
\r
632 <p>An output line is formatted this way:</p>
\r
633 <div class="listingblock">
\r
634 <div class="content">
\r
635 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
\r
636 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
\r
637 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
\r
638 create :000000 100644 0000000... 1234567... A file4
\r
639 delete :100644 000000 1234567... 0000000... D file5
\r
640 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
\r
642 <p>That is, from the left to the right:</p>
\r
651 mode for "src"; 000000 if creation or unmerged.
\r
661 mode for "dst"; 000000 if deletion or unmerged.
\r
671 sha1 for "src"; 0{40} if creation or unmerged.
\r
681 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
\r
691 status, followed by optional "score" number.
\r
696 a tab or a NUL when <em>-z</em> option is used.
\r
706 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
\r
711 path for "dst"; only exists for C or R.
\r
716 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
\r
720 <p><sha1> is shown as all 0's if a file is new on the filesystem
\r
721 and it is out of sync with the index.</p>
\r
723 <div class="listingblock">
\r
724 <div class="content">
\r
725 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
\r
727 <p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
\r
728 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
731 <h2>Generating patches with -p</h2>
\r
732 <div class="sectionbody">
\r
733 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
\r
734 with a <em>-p</em> option, they do not produce the output described above;
\r
735 instead they produce a patch file.</p>
\r
736 <p>The patch generation can be customized at two levels.</p>
\r
740 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is not set,
\r
741 these commands internally invoke "diff" like this:
\r
743 <div class="literalblock">
\r
744 <div class="content">
\r
745 <pre><tt>diff -L a/<path> -L b/<path> -pu <old> <new></tt></pre>
\r
747 <p>For added files, <tt>/dev/null</tt> is used for <old>. For removed
\r
748 files, <tt>/dev/null</tt> is used for <new></p>
\r
749 <p>The "diff" formatting options can be customized via the
\r
750 environment variable <em>GIT_DIFF_OPTS</em>. For example, if you
\r
751 prefer context diff:</p>
\r
752 <div class="literalblock">
\r
753 <div class="content">
\r
754 <pre><tt>GIT_DIFF_OPTS=-c git-diff-index -p HEAD</tt></pre>
\r
759 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is set, the
\r
760 program named by it is called, instead of the diff invocation
\r
763 <p>For a path that is added, removed, or modified,
\r
764 <em>GIT_EXTERNAL_DIFF</em> is called with 7 parameters:</p>
\r
765 <div class="literalblock">
\r
766 <div class="content">
\r
767 <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
\r
770 <div class="hlist"><table>
\r
772 <td class="hlist1">
\r
773 <old|new>-file
\r
775 <td class="hlist2">
\r
776 are files GIT_EXTERNAL_DIFF can use to read the
\r
777 contents of <old|new>,
\r
781 <td class="hlist1">
\r
782 <old|new>-hex
\r
784 <td class="hlist2">
\r
785 are the 40-hexdigit SHA1 hashes,
\r
789 <td class="hlist1">
\r
790 <old|new>-mode
\r
792 <td class="hlist2">
\r
793 are the octal representation of the file modes.
\r
797 <p>The file parameters can point at the user's working file
\r
798 (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
\r
799 when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
\r
800 index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
\r
801 temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p>
\r
804 <p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
\r
805 parameter, <path>.</p>
\r
807 <h2>git specific extension to diff format</h2>
\r
808 <div class="sectionbody">
\r
809 <p>What -p option produces is slightly different from the
\r
810 traditional diff format.</p>
\r
814 It is preceeded with a "git diff" header, that looks like
\r
817 <div class="literalblock">
\r
818 <div class="content">
\r
819 <pre><tt>diff --git a/file1 b/file2</tt></pre>
\r
821 <p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
\r
822 involved. Especially, even for a creation or a deletion,
\r
823 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
\r
824 <p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
\r
825 name of the source file of the rename/copy and the name of
\r
826 the file that rename/copy produces, respectively.</p>
\r
830 It is followed by one or more extended header lines:
\r
832 <div class="literalblock">
\r
833 <div class="content">
\r
834 <pre><tt>old mode <mode>
\r
835 new mode <mode>
\r
836 deleted file mode <mode>
\r
837 new file mode <mode>
\r
838 copy from <path>
\r
839 copy to <path>
\r
840 rename from <path>
\r
841 rename to <path>
\r
842 similarity index <number>
\r
843 dissimilarity index <number>
\r
844 index <hash>..<hash> <mode></tt></pre>
\r
849 TAB, LF, and backslash characters in pathnames are
\r
850 represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.
\r
856 <div class="sectionbody">
\r
857 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
859 <h2>Documentation</h2>
\r
860 <div class="sectionbody">
\r
861 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
864 <div class="sectionbody">
\r
865 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
868 <div id="footer-text">
\r
869 Last updated 27-Dec-2005 00:16:04 PDT
\r
projects / git.git / blob