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-files(1)</title>
\r
264 git-diff-files(1) Manual Page
\r
267 <div class="sectionbody">
\r
268 <p>git-diff-files -
\r
269 Compares files in the working tree and the index
\r
274 <div class="sectionbody">
\r
275 <p><em>git-diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Compares the files in the working tree and the index. When paths
\r
280 are specified, compares only those named paths. Otherwise all
\r
281 entries in the index are compared. The output format is the
\r
282 same as "git-diff-index" and "git-diff-tree".</p>
\r
285 <div class="sectionbody">
\r
292 Generate patch (see section on generating patches)
\r
308 Generate patch but keep also the default raw diff output.
\r
316 Generate a diffstat instead of a patch.
\r
324 Generate patch and prepend its diffstat.
\r
332 \0 line termination on output
\r
340 Show only names of changed files.
\r
348 Show only names and status of changed files.
\r
356 Instead of the first handful characters, show full
\r
357 object name of pre- and post-image blob on the "index"
\r
358 line when generating a patch format output.
\r
362 --abbrev[=<n>]
\r
366 Instead of showing the full 40-byte hexadecimal object
\r
367 name in diff-raw format output and diff-tree header
\r
368 lines, show only handful hexdigits prefix. This is
\r
369 independent of --full-index option above, which controls
\r
370 the diff-patch output format. Non default number of
\r
371 digits can be specified with --abbrev=<n>.
\r
379 Break complete rewrite changes into pairs of delete and create.
\r
395 Detect copies as well as renames.
\r
399 --diff-filter=[ACDMRTUXB*]
\r
403 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
\r
404 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
\r
405 type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
\r
406 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
\r
407 Any combination of the filter characters may be used.
\r
408 When <tt>*</tt> (All-or-none) is added to the combination, all
\r
409 paths are selected if there is any file that matches
\r
410 other criteria in the comparison; if there is no file
\r
411 that matches other criteria, nothing is selected.
\r
415 --find-copies-harder
\r
419 For performance reasons, by default, -C option finds copies only
\r
420 if the original file of the copy was modified in the same
\r
421 changeset. This flag makes the command
\r
422 inspect unmodified files as candidates for the source of
\r
423 copy. This is a very expensive operation for large
\r
424 projects, so use it with caution.
\r
432 -M and -C options require O(n^2) processing time where n
\r
433 is the number of potential rename/copy targets. This
\r
434 option prevents rename/copy detection from running if
\r
435 the number of rename/copy targets exceeds the specified
\r
444 Look for differences that contain the change in <string>.
\r
452 When -S finds a change, show all the changes in that
\r
453 changeset, not just the files that contain the change
\r
462 Make the <string> not a plain string but an extended POSIX
\r
467 -O<orderfile>
\r
471 Output the patch in the order specified in the
\r
472 <orderfile>, which has one shell glob pattern per line.
\r
480 Swap two inputs; that is, show differences from index or
\r
481 on-disk file to tree contents.
\r
485 <p>For more detailed explanation on these common options, see also
\r
486 <a href="diffcore.html">diffcore documentation</a>.</p>
\r
489 -1 -2 -3 or --base --ours --theirs, and -0
\r
493 Diff against the "base" version, "our branch" or "their
\r
494 branch" respectively. With these options, diffs for
\r
495 merged entries are not shown.
\r
497 <p>The default is to diff against our branch (-2) and the
\r
498 cleanly resolved paths. The option -0 can be given to
\r
499 omit diff output for unmerged entries and just show "Unmerged".</p>
\r
506 This compares stage 2 (our branch), stage 3 (their
\r
507 branch) and the working tree file and outputs a combined
\r
508 diff, similar to the way <em>diff-tree</em> shows a merge
\r
509 commit with these flags.
\r
517 Remain silent even on nonexisting files
\r
522 <h2>Output format</h2>
\r
523 <div class="sectionbody">
\r
524 <p>The output format from "git-diff-index", "git-diff-tree" and
\r
525 "git-diff-files" are very similar.</p>
\r
526 <p>These commands all compare two sets of things; what is
\r
527 compared differs:</p>
\r
530 git-diff-index <tree-ish>
\r
534 compares the <tree-ish> and the files on the filesystem.
\r
538 git-diff-index --cached <tree-ish>
\r
542 compares the <tree-ish> and the index.
\r
546 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
\r
550 compares the trees named by the two arguments.
\r
554 git-diff-files [<pattern>…]
\r
558 compares the index and the files on the filesystem.
\r
562 <p>An output line is formatted this way:</p>
\r
563 <div class="listingblock">
\r
564 <div class="content">
\r
565 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
\r
566 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
\r
567 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
\r
568 create :000000 100644 0000000... 1234567... A file4
\r
569 delete :100644 000000 1234567... 0000000... D file5
\r
570 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
\r
572 <p>That is, from the left to the right:</p>
\r
581 mode for "src"; 000000 if creation or unmerged.
\r
591 mode for "dst"; 000000 if deletion or unmerged.
\r
601 sha1 for "src"; 0{40} if creation or unmerged.
\r
611 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
\r
621 status, followed by optional "score" number.
\r
626 a tab or a NUL when <em>-z</em> option is used.
\r
636 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
\r
641 path for "dst"; only exists for C or R.
\r
646 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
\r
650 <p><sha1> is shown as all 0's if a file is new on the filesystem
\r
651 and it is out of sync with the index.</p>
\r
653 <div class="listingblock">
\r
654 <div class="content">
\r
655 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
\r
657 <p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
\r
658 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
661 <h2>Generating patches with -p</h2>
\r
662 <div class="sectionbody">
\r
663 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
\r
664 with a <em>-p</em> option, they do not produce the output described above;
\r
665 instead they produce a patch file.</p>
\r
666 <p>The patch generation can be customized at two levels.</p>
\r
670 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is not set,
\r
671 these commands internally invoke "diff" like this:
\r
673 <div class="literalblock">
\r
674 <div class="content">
\r
675 <pre><tt>diff -L a/<path> -L b/<path> -pu <old> <new></tt></pre>
\r
677 <p>For added files, <tt>/dev/null</tt> is used for <old>. For removed
\r
678 files, <tt>/dev/null</tt> is used for <new></p>
\r
679 <p>The "diff" formatting options can be customized via the
\r
680 environment variable <em>GIT_DIFF_OPTS</em>. For example, if you
\r
681 prefer context diff:</p>
\r
682 <div class="literalblock">
\r
683 <div class="content">
\r
684 <pre><tt>GIT_DIFF_OPTS=-c git-diff-index -p HEAD</tt></pre>
\r
689 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is set, the
\r
690 program named by it is called, instead of the diff invocation
\r
693 <p>For a path that is added, removed, or modified,
\r
694 <em>GIT_EXTERNAL_DIFF</em> is called with 7 parameters:</p>
\r
695 <div class="literalblock">
\r
696 <div class="content">
\r
697 <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
\r
700 <div class="hlist"><table>
\r
702 <td class="hlist1">
\r
703 <old|new>-file
\r
705 <td class="hlist2">
\r
706 are files GIT_EXTERNAL_DIFF can use to read the
\r
707 contents of <old|new>,
\r
711 <td class="hlist1">
\r
712 <old|new>-hex
\r
714 <td class="hlist2">
\r
715 are the 40-hexdigit SHA1 hashes,
\r
719 <td class="hlist1">
\r
720 <old|new>-mode
\r
722 <td class="hlist2">
\r
723 are the octal representation of the file modes.
\r
727 <p>The file parameters can point at the user's working file
\r
728 (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
\r
729 when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
\r
730 index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
\r
731 temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p>
\r
734 <p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
\r
735 parameter, <path>.</p>
\r
737 <h2>git specific extension to diff format</h2>
\r
738 <div class="sectionbody">
\r
739 <p>What -p option produces is slightly different from the
\r
740 traditional diff format.</p>
\r
744 It is preceded with a "git diff" header, that looks like
\r
747 <div class="literalblock">
\r
748 <div class="content">
\r
749 <pre><tt>diff --git a/file1 b/file2</tt></pre>
\r
751 <p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
\r
752 involved. Especially, even for a creation or a deletion,
\r
753 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
\r
754 <p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
\r
755 name of the source file of the rename/copy and the name of
\r
756 the file that rename/copy produces, respectively.</p>
\r
760 It is followed by one or more extended header lines:
\r
762 <div class="literalblock">
\r
763 <div class="content">
\r
764 <pre><tt>old mode <mode>
\r
765 new mode <mode>
\r
766 deleted file mode <mode>
\r
767 new file mode <mode>
\r
768 copy from <path>
\r
769 copy to <path>
\r
770 rename from <path>
\r
771 rename to <path>
\r
772 similarity index <number>
\r
773 dissimilarity index <number>
\r
774 index <hash>..<hash> <mode></tt></pre>
\r
779 TAB, LF, and backslash characters in pathnames are
\r
780 represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.
\r
785 <h2>combined diff format</h2>
\r
786 <div class="sectionbody">
\r
787 <p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option
\r
788 to produce <em>combined diff</em>, which looks like this:</p>
\r
789 <div class="listingblock">
\r
790 <div class="content">
\r
791 <pre><tt>diff --combined describe.c
\r
793 return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
\r
796 - static void describe(char *arg)
\r
797 -static void describe(struct commit *cmit, int last_one)
\r
798 ++static void describe(char *arg, int last_one)
\r
800 + unsigned char sha1[20];
\r
801 + struct commit *cmit;</tt></pre>
\r
803 <p>Unlike the traditional <em>unified</em> diff format, which shows two
\r
804 files A and B with a single column that has <tt>-</tt> (minus —
\r
805 appears in A but removed in B), <tt>+</tt> (plus — missing in A but
\r
806 added to B), or <tt> </tt> (space — unchanged) prefix, this format
\r
807 compares two or more files file1, file2,… with one file X, and
\r
808 shows how X differs from each of fileN. One column for each of
\r
809 fileN is prepended to the output line to note how X's line is
\r
810 different from it.</p>
\r
811 <p>A <tt>-</tt> character in the column N means that the line appears in
\r
812 fileN but it does not appear in the last file. A <tt>+</tt> character
\r
813 in the column N means that the line appears in the last file,
\r
814 and fileN does not have that line.</p>
\r
815 <p>In the above example output, the function signature was changed
\r
816 from both files (hence two <tt>-</tt> removals from both file1 and
\r
817 file2, plus <tt>++</tt> to mean one line that was added does not appear
\r
818 in either file1 nor file2). Also two other lines are the same
\r
819 from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
\r
820 <p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
\r
821 merge commit with the merge result (i.e. file1..fileN are the
\r
822 parents). When shown by <tt>git diff-files -c</tt>, it compares the
\r
823 two unresolved merge parents with the working tree file
\r
824 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
\r
825 "their version").</p>
\r
828 <div class="sectionbody">
\r
829 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
831 <h2>Documentation</h2>
\r
832 <div class="sectionbody">
\r
833 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
836 <div class="sectionbody">
\r
837 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
840 <div id="footer-text">
\r
841 Last updated 16-Apr-2006 11:00:55 UTC
\r
projects / git.git / blob