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-index(1)</title>
\r
264 git-diff-index(1) Manual Page
\r
267 <div class="sectionbody">
\r
268 <p>git-diff-index -
\r
269 Compares content and mode of blobs between the index and repository
\r
274 <div class="sectionbody">
\r
275 <p><em>git-diff-index</em> [-m] [--cached] [<common diff options>] <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 a tree
\r
280 object with the content of the current index and, optionally
\r
281 ignoring the stat state of the file on disk. When paths are
\r
282 specified, compares only those named paths. Otherwise all
\r
283 entries in the index are compared.</p>
\r
286 <div class="sectionbody">
\r
293 Generate patch (see section on generating patches)
\r
309 \0 line termination on output
\r
317 Show only names of changed files.
\r
325 Show only names and status of changed files.
\r
333 Instead of the first handful characters, show full
\r
334 object name of pre- and post-image blob on the "index"
\r
335 line when generating a patch format output.
\r
339 --abbrev[=<n>]
\r
343 Instead of showing the full 40-byte hexadecimal object
\r
344 name in diff-raw format output and diff-tree header
\r
345 lines, show only handful hexdigits prefix. This is
\r
346 independent of --full-index option above, which controls
\r
347 the diff-patch output format. Non default number of
\r
348 digits can be specified with --abbrev=<n>.
\r
356 Break complete rewrite changes into pairs of delete and create.
\r
372 Detect copies as well as renames.
\r
376 --diff-filter=[ACDMRTUXB*]
\r
380 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
\r
381 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
\r
382 type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
\r
383 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
\r
384 Any combination of the filter characters may be used.
\r
385 When <tt>*</tt> (All-or-none) is added to the combination, all
\r
386 paths are selected if there is any file that matches
\r
387 other criteria in the comparison; if there is no file
\r
388 that matches other criteria, nothing is selected.
\r
392 --find-copies-harder
\r
396 For performance reasons, by default, -C option finds copies only
\r
397 if the original file of the copy was modified in the same
\r
398 changeset. This flag makes the command
\r
399 inspect unmodified files as candidates for the source of
\r
400 copy. This is a very expensive operation for large
\r
401 projects, so use it with caution.
\r
409 -M and -C options require O(n^2) processing time where n
\r
410 is the number of potential rename/copy targets. This
\r
411 option prevents rename/copy detection from running if
\r
412 the number of rename/copy targets exceeds the specified
\r
421 Look for differences that contain the change in <string>.
\r
429 When -S finds a change, show all the changes in that
\r
430 changeset, not just the files that contain the change
\r
439 Make the <string> not a plain string but an extended POSIX
\r
444 -O<orderfile>
\r
448 Output the patch in the order specified in the
\r
449 <orderfile>, which has one shell glob pattern per line.
\r
457 Swap two inputs; that is, show differences from index or
\r
458 on-disk file to tree contents.
\r
462 <p>For more detailed explanation on these common options, see also
\r
463 <a href="diffcore.html">diffcore documentation</a>.</p>
\r
470 The id of a tree object to diff against.
\r
478 do not consider the on-disk file at all
\r
486 By default, files recorded in the index but not checked
\r
487 out are reported as deleted. This flag makes
\r
488 "git-diff-index" say that all non-checked-out files are up
\r
494 <h2>Output format</h2>
\r
495 <div class="sectionbody">
\r
496 <p>The output format from "git-diff-index", "git-diff-tree" and
\r
497 "git-diff-files" are very similar.</p>
\r
498 <p>These commands all compare two sets of things; what is
\r
499 compared differs:</p>
\r
502 git-diff-index <tree-ish>
\r
506 compares the <tree-ish> and the files on the filesystem.
\r
510 git-diff-index --cached <tree-ish>
\r
514 compares the <tree-ish> and the index.
\r
518 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
\r
522 compares the trees named by the two arguments.
\r
526 git-diff-files [<pattern>…]
\r
530 compares the index and the files on the filesystem.
\r
534 <p>An output line is formatted this way:</p>
\r
535 <div class="listingblock">
\r
536 <div class="content">
\r
537 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
\r
538 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
\r
539 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
\r
540 create :000000 100644 0000000... 1234567... A file4
\r
541 delete :100644 000000 1234567... 0000000... D file5
\r
542 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
\r
544 <p>That is, from the left to the right:</p>
\r
553 mode for "src"; 000000 if creation or unmerged.
\r
563 mode for "dst"; 000000 if deletion or unmerged.
\r
573 sha1 for "src"; 0{40} if creation or unmerged.
\r
583 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
\r
593 status, followed by optional "score" number.
\r
598 a tab or a NUL when <em>-z</em> option is used.
\r
608 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
\r
613 path for "dst"; only exists for C or R.
\r
618 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
\r
622 <p><sha1> is shown as all 0's if a file is new on the filesystem
\r
623 and it is out of sync with the index.</p>
\r
625 <div class="listingblock">
\r
626 <div class="content">
\r
627 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
\r
629 <p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
\r
630 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
633 <h2>Generating patches with -p</h2>
\r
634 <div class="sectionbody">
\r
635 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
\r
636 with a <em>-p</em> option, they do not produce the output described above;
\r
637 instead they produce a patch file.</p>
\r
638 <p>The patch generation can be customized at two levels.</p>
\r
642 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is not set,
\r
643 these commands internally invoke "diff" like this:
\r
645 <div class="literalblock">
\r
646 <div class="content">
\r
647 <pre><tt>diff -L a/<path> -L b/<path> -pu <old> <new></tt></pre>
\r
649 <p>For added files, <tt>/dev/null</tt> is used for <old>. For removed
\r
650 files, <tt>/dev/null</tt> is used for <new></p>
\r
651 <p>The "diff" formatting options can be customized via the
\r
652 environment variable <em>GIT_DIFF_OPTS</em>. For example, if you
\r
653 prefer context diff:</p>
\r
654 <div class="literalblock">
\r
655 <div class="content">
\r
656 <pre><tt>GIT_DIFF_OPTS=-c git-diff-index -p HEAD</tt></pre>
\r
661 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is set, the
\r
662 program named by it is called, instead of the diff invocation
\r
665 <p>For a path that is added, removed, or modified,
\r
666 <em>GIT_EXTERNAL_DIFF</em> is called with 7 parameters:</p>
\r
667 <div class="literalblock">
\r
668 <div class="content">
\r
669 <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
\r
672 <div class="hlist"><table>
\r
674 <td class="hlist1">
\r
675 <old|new>-file
\r
677 <td class="hlist2">
\r
678 are files GIT_EXTERNAL_DIFF can use to read the
\r
679 contents of <old|new>,
\r
683 <td class="hlist1">
\r
684 <old|new>-hex
\r
686 <td class="hlist2">
\r
687 are the 40-hexdigit SHA1 hashes,
\r
691 <td class="hlist1">
\r
692 <old|new>-mode
\r
694 <td class="hlist2">
\r
695 are the octal representation of the file modes.
\r
699 <p>The file parameters can point at the user's working file
\r
700 (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
\r
701 when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
\r
702 index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
\r
703 temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p>
\r
706 <p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
\r
707 parameter, <path>.</p>
\r
709 <h2>git specific extension to diff format</h2>
\r
710 <div class="sectionbody">
\r
711 <p>What -p option produces is slightly different from the
\r
712 traditional diff format.</p>
\r
716 It is preceded with a "git diff" header, that looks like
\r
719 <div class="literalblock">
\r
720 <div class="content">
\r
721 <pre><tt>diff --git a/file1 b/file2</tt></pre>
\r
723 <p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
\r
724 involved. Especially, even for a creation or a deletion,
\r
725 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
\r
726 <p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
\r
727 name of the source file of the rename/copy and the name of
\r
728 the file that rename/copy produces, respectively.</p>
\r
732 It is followed by one or more extended header lines:
\r
734 <div class="literalblock">
\r
735 <div class="content">
\r
736 <pre><tt>old mode <mode>
\r
737 new mode <mode>
\r
738 deleted file mode <mode>
\r
739 new file mode <mode>
\r
740 copy from <path>
\r
741 copy to <path>
\r
742 rename from <path>
\r
743 rename to <path>
\r
744 similarity index <number>
\r
745 dissimilarity index <number>
\r
746 index <hash>..<hash> <mode></tt></pre>
\r
751 TAB, LF, and backslash characters in pathnames are
\r
752 represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.
\r
757 <h2>combined diff format</h2>
\r
758 <div class="sectionbody">
\r
759 <p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option
\r
760 to produce <em>combined diff</em>, which looks like this:</p>
\r
761 <div class="listingblock">
\r
762 <div class="content">
\r
763 <pre><tt>diff --combined describe.c
\r
765 return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
\r
768 - static void describe(char *arg)
\r
769 -static void describe(struct commit *cmit, int last_one)
\r
770 ++static void describe(char *arg, int last_one)
\r
772 + unsigned char sha1[20];
\r
773 + struct commit *cmit;</tt></pre>
\r
775 <p>Unlike the traditional <em>unified</em> diff format, which shows two
\r
776 files A and B with a single column that has <tt>-</tt> (minus —
\r
777 appears in A but removed in B), <tt>+</tt> (plus — missing in A but
\r
778 added to B), or <tt> </tt> (space — unchanged) prefix, this format
\r
779 compares two or more files file1, file2,… with one file X, and
\r
780 shows how X differs from each of fileN. One column for each of
\r
781 fileN is prepended to the output line to note how X's line is
\r
782 different from it.</p>
\r
783 <p>A <tt>-</tt> character in the column N means that the line appears in
\r
784 fileN but it does not appear in the last file. A <tt>+</tt> character
\r
785 in the column N means that the line appears in the last file,
\r
786 and fileN does not have that line.</p>
\r
787 <p>In the above example output, the function signature was changed
\r
788 from both files (hence two <tt>-</tt> removals from both file1 and
\r
789 file2, plus <tt>++</tt> to mean one line that was added does not appear
\r
790 in either file1 nor file2). Also two other lines are the same
\r
791 from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
\r
792 <p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
\r
793 merge commit with the merge result (i.e. file1..fileN are the
\r
794 parents). When shown by <tt>git diff-files -c</tt>, it compares the
\r
795 two unresolved merge parents with the working tree file
\r
796 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
\r
797 "their version").</p>
\r
799 <h2>Operating Modes</h2>
\r
800 <div class="sectionbody">
\r
801 <p>You can choose whether you want to trust the index file entirely
\r
802 (using the <em>--cached</em> flag) or ask the diff logic to show any files
\r
803 that don't match the stat state as being "tentatively changed". Both
\r
804 of these operations are very useful indeed.</p>
\r
806 <h2>Cached Mode</h2>
\r
807 <div class="sectionbody">
\r
808 <p>If <em>--cached</em> is specified, it allows you to ask:</p>
\r
809 <div class="literalblock">
\r
810 <div class="content">
\r
811 <pre><tt>show me the differences between HEAD and the current index
\r
812 contents (the ones I'd write with a "git-write-tree")</tt></pre>
\r
814 <p>For example, let's say that you have worked on your working directory, updated
\r
815 some files in the index and are ready to commit. You want to see exactly
\r
816 <strong>what</strong> you are going to commit is without having to write a new tree
\r
817 object and compare it that way, and to do that, you just do</p>
\r
818 <div class="literalblock">
\r
819 <div class="content">
\r
820 <pre><tt>git-diff-index --cached HEAD</tt></pre>
\r
822 <p>Example: let's say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had
\r
823 done an "git-update-index" to make that effective in the index file.
\r
824 "git-diff-files" wouldn't show anything at all, since the index file
\r
825 matches my working directory. But doing a "git-diff-index" does:</p>
\r
826 <div class="literalblock">
\r
827 <div class="content">
\r
828 <pre><tt>torvalds@ppc970:~/git> git-diff-index --cached HEAD
\r
829 -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c
\r
830 +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c</tt></pre>
\r
832 <p>You can trivially see that the above is a rename.</p>
\r
833 <p>In fact, "git-diff-index --cached" <strong>should</strong> always be entirely equivalent to
\r
834 actually doing a "git-write-tree" and comparing that. Except this one is much
\r
835 nicer for the case where you just want to check where you are.</p>
\r
836 <p>So doing a "git-diff-index --cached" is basically very useful when you are
\r
837 asking yourself "what have I already marked for being committed, and
\r
838 what's the difference to a previous tree".</p>
\r
840 <h2>Non-cached Mode</h2>
\r
841 <div class="sectionbody">
\r
842 <p>The "non-cached" mode takes a different approach, and is potentially
\r
843 the more useful of the two in that what it does can't be emulated with
\r
844 a "git-write-tree" + "git-diff-tree". Thus that's the default mode.
\r
845 The non-cached version asks the question:</p>
\r
846 <div class="literalblock">
\r
847 <div class="content">
\r
848 <pre><tt>show me the differences between HEAD and the currently checked out
\r
849 tree - index contents _and_ files that aren't up-to-date</tt></pre>
\r
851 <p>which is obviously a very useful question too, since that tells you what
\r
852 you <strong>could</strong> commit. Again, the output matches the "git-diff-tree -r"
\r
853 output to a tee, but with a twist.</p>
\r
854 <p>The twist is that if some file doesn't match the index, we don't have
\r
855 a backing store thing for it, and we use the magic "all-zero" sha1 to
\r
856 show that. So let's say that you have edited <tt>kernel/sched.c</tt>, but
\r
857 have not actually done a "git-update-index" on it yet - there is no
\r
858 "object" associated with the new state, and you get:</p>
\r
859 <div class="literalblock">
\r
860 <div class="content">
\r
861 <pre><tt>torvalds@ppc970:~/v2.6/linux> git-diff-index HEAD
\r
862 *100644->100664 blob 7476bb......->000000...... kernel/sched.c</tt></pre>
\r
864 <p>ie it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is
\r
865 not up-to-date and may contain new stuff. The all-zero sha1 means that to
\r
866 get the real diff, you need to look at the object in the working directory
\r
867 directly rather than do an object-to-object diff.</p>
\r
868 <div class="admonitionblock">
\r
871 <div class="title">Note</div>
\r
873 <td class="content">As with other commands of this type, "git-diff-index" does not
\r
874 actually look at the contents of the file at all. So maybe
\r
875 <tt>kernel/sched.c</tt> hasn't actually changed, and it's just that you
\r
876 touched it. In either case, it's a note that you need to
\r
877 "git-update-index" it to make the index be in sync.</td>
\r
880 <div class="admonitionblock">
\r
883 <div class="title">Note</div>
\r
885 <td class="content">You can have a mixture of files show up as "has been updated"
\r
886 and "is still dirty in the working directory" together. You can always
\r
887 tell which file is in which state, since the "has been updated" ones
\r
888 show a valid sha1, and the "not in sync with the index" ones will
\r
889 always have the special all-zero sha1.</td>
\r
894 <div class="sectionbody">
\r
895 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
897 <h2>Documentation</h2>
\r
898 <div class="sectionbody">
\r
899 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
902 <div class="sectionbody">
\r
903 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
906 <div id="footer-text">
\r
907 Last updated 05-Apr-2006 21:43:19 UTC
\r
projects / git.git / blob