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 \0 line termination on output
\r
332 Show only names of changed files.
\r
340 Show only names and status of changed files.
\r
348 Instead of the first handful characters, show full
\r
349 object name of pre- and post-image blob on the "index"
\r
350 line when generating a patch format output.
\r
354 --abbrev[=<n>]
\r
358 Instead of showing the full 40-byte hexadecimal object
\r
359 name in diff-raw format output and diff-tree header
\r
360 lines, show only handful hexdigits prefix. This is
\r
361 independent of --full-index option above, which controls
\r
362 the diff-patch output format. Non default number of
\r
363 digits can be specified with --abbrev=<n>.
\r
371 Break complete rewrite changes into pairs of delete and create.
\r
387 Detect copies as well as renames.
\r
391 --diff-filter=[ACDMRTUXB*]
\r
395 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
\r
396 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
\r
397 type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
\r
398 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
\r
399 Any combination of the filter characters may be used.
\r
400 When <tt>*</tt> (All-or-none) is added to the combination, all
\r
401 paths are selected if there is any file that matches
\r
402 other criteria in the comparison; if there is no file
\r
403 that matches other criteria, nothing is selected.
\r
407 --find-copies-harder
\r
411 For performance reasons, by default, -C option finds copies only
\r
412 if the original file of the copy was modified in the same
\r
413 changeset. This flag makes the command
\r
414 inspect unmodified files as candidates for the source of
\r
415 copy. This is a very expensive operation for large
\r
416 projects, so use it with caution.
\r
424 -M and -C options require O(n^2) processing time where n
\r
425 is the number of potential rename/copy targets. This
\r
426 option prevents rename/copy detection from running if
\r
427 the number of rename/copy targets exceeds the specified
\r
436 Look for differences that contain the change in <string>.
\r
444 When -S finds a change, show all the changes in that
\r
445 changeset, not just the files that contain the change
\r
454 Make the <string> not a plain string but an extended POSIX
\r
459 -O<orderfile>
\r
463 Output the patch in the order specified in the
\r
464 <orderfile>, which has one shell glob pattern per line.
\r
472 Swap two inputs; that is, show differences from index or
\r
473 on-disk file to tree contents.
\r
477 <p>For more detailed explanation on these common options, see also
\r
478 <a href="diffcore.html">diffcore documentation</a>.</p>
\r
481 -1 -2 -3 or --base --ours --theirs, and -0
\r
485 Diff against the "base" version, "our branch" or "their
\r
486 branch" respectively. With these options, diffs for
\r
487 merged entries are not shown.
\r
489 <p>The default is to diff against our branch (-2) and the
\r
490 cleanly resolved paths. The option -0 can be given to
\r
491 omit diff output for unmerged entries and just show "Unmerged".</p>
\r
498 This compares stage 2 (our branch), stage 3 (their
\r
499 branch) and the working tree file and outputs a combined
\r
500 diff, similar to the way <em>diff-tree</em> shows a merge
\r
501 commit with these flags.
\r
509 Remain silent even on nonexisting files
\r
514 <h2>Output format</h2>
\r
515 <div class="sectionbody">
\r
516 <p>The output format from "git-diff-index", "git-diff-tree" and
\r
517 "git-diff-files" are very similar.</p>
\r
518 <p>These commands all compare two sets of things; what is
\r
519 compared differs:</p>
\r
522 git-diff-index <tree-ish>
\r
526 compares the <tree-ish> and the files on the filesystem.
\r
530 git-diff-index --cached <tree-ish>
\r
534 compares the <tree-ish> and the index.
\r
538 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
\r
542 compares the trees named by the two arguments.
\r
546 git-diff-files [<pattern>…]
\r
550 compares the index and the files on the filesystem.
\r
554 <p>An output line is formatted this way:</p>
\r
555 <div class="listingblock">
\r
556 <div class="content">
\r
557 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
\r
558 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
\r
559 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
\r
560 create :000000 100644 0000000... 1234567... A file4
\r
561 delete :100644 000000 1234567... 0000000... D file5
\r
562 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
\r
564 <p>That is, from the left to the right:</p>
\r
573 mode for "src"; 000000 if creation or unmerged.
\r
583 mode for "dst"; 000000 if deletion or unmerged.
\r
593 sha1 for "src"; 0{40} if creation or unmerged.
\r
603 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
\r
613 status, followed by optional "score" number.
\r
618 a tab or a NUL when <em>-z</em> option is used.
\r
628 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
\r
633 path for "dst"; only exists for C or R.
\r
638 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
\r
642 <p><sha1> is shown as all 0's if a file is new on the filesystem
\r
643 and it is out of sync with the index.</p>
\r
645 <div class="listingblock">
\r
646 <div class="content">
\r
647 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
\r
649 <p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
\r
650 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
653 <h2>Generating patches with -p</h2>
\r
654 <div class="sectionbody">
\r
655 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
\r
656 with a <em>-p</em> option, they do not produce the output described above;
\r
657 instead they produce a patch file.</p>
\r
658 <p>The patch generation can be customized at two levels.</p>
\r
662 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is not set,
\r
663 these commands internally invoke "diff" like this:
\r
665 <div class="literalblock">
\r
666 <div class="content">
\r
667 <pre><tt>diff -L a/<path> -L b/<path> -pu <old> <new></tt></pre>
\r
669 <p>For added files, <tt>/dev/null</tt> is used for <old>. For removed
\r
670 files, <tt>/dev/null</tt> is used for <new></p>
\r
671 <p>The "diff" formatting options can be customized via the
\r
672 environment variable <em>GIT_DIFF_OPTS</em>. For example, if you
\r
673 prefer context diff:</p>
\r
674 <div class="literalblock">
\r
675 <div class="content">
\r
676 <pre><tt>GIT_DIFF_OPTS=-c git-diff-index -p HEAD</tt></pre>
\r
681 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is set, the
\r
682 program named by it is called, instead of the diff invocation
\r
685 <p>For a path that is added, removed, or modified,
\r
686 <em>GIT_EXTERNAL_DIFF</em> is called with 7 parameters:</p>
\r
687 <div class="literalblock">
\r
688 <div class="content">
\r
689 <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
\r
692 <div class="hlist"><table>
\r
694 <td class="hlist1">
\r
695 <old|new>-file
\r
697 <td class="hlist2">
\r
698 are files GIT_EXTERNAL_DIFF can use to read the
\r
699 contents of <old|new>,
\r
703 <td class="hlist1">
\r
704 <old|new>-hex
\r
706 <td class="hlist2">
\r
707 are the 40-hexdigit SHA1 hashes,
\r
711 <td class="hlist1">
\r
712 <old|new>-mode
\r
714 <td class="hlist2">
\r
715 are the octal representation of the file modes.
\r
719 <p>The file parameters can point at the user's working file
\r
720 (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
\r
721 when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
\r
722 index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
\r
723 temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p>
\r
726 <p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
\r
727 parameter, <path>.</p>
\r
729 <h2>git specific extension to diff format</h2>
\r
730 <div class="sectionbody">
\r
731 <p>What -p option produces is slightly different from the
\r
732 traditional diff format.</p>
\r
736 It is preceded with a "git diff" header, that looks like
\r
739 <div class="literalblock">
\r
740 <div class="content">
\r
741 <pre><tt>diff --git a/file1 b/file2</tt></pre>
\r
743 <p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
\r
744 involved. Especially, even for a creation or a deletion,
\r
745 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
\r
746 <p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
\r
747 name of the source file of the rename/copy and the name of
\r
748 the file that rename/copy produces, respectively.</p>
\r
752 It is followed by one or more extended header lines:
\r
754 <div class="literalblock">
\r
755 <div class="content">
\r
756 <pre><tt>old mode <mode>
\r
757 new mode <mode>
\r
758 deleted file mode <mode>
\r
759 new file mode <mode>
\r
760 copy from <path>
\r
761 copy to <path>
\r
762 rename from <path>
\r
763 rename to <path>
\r
764 similarity index <number>
\r
765 dissimilarity index <number>
\r
766 index <hash>..<hash> <mode></tt></pre>
\r
771 TAB, LF, and backslash characters in pathnames are
\r
772 represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.
\r
777 <h2>combined diff format</h2>
\r
778 <div class="sectionbody">
\r
779 <p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option
\r
780 to produce <em>combined diff</em>, which looks like this:</p>
\r
781 <div class="listingblock">
\r
782 <div class="content">
\r
783 <pre><tt>diff --combined describe.c
\r
785 return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
\r
788 - static void describe(char *arg)
\r
789 -static void describe(struct commit *cmit, int last_one)
\r
790 ++static void describe(char *arg, int last_one)
\r
792 + unsigned char sha1[20];
\r
793 + struct commit *cmit;</tt></pre>
\r
795 <p>Unlike the traditional <em>unified</em> diff format, which shows two
\r
796 files A and B with a single column that has <tt>-</tt> (minus —
\r
797 appears in A but removed in B), <tt>+</tt> (plus — missing in A but
\r
798 added to B), or <tt> </tt> (space — unchanged) prefix, this format
\r
799 compares two or more files file1, file2,… with one file X, and
\r
800 shows how X differs from each of fileN. One column for each of
\r
801 fileN is prepended to the output line to note how X's line is
\r
802 different from it.</p>
\r
803 <p>A <tt>-</tt> character in the column N means that the line appears in
\r
804 fileN but it does not appear in the last file. A <tt>+</tt> character
\r
805 in the column N means that the line appears in the last file,
\r
806 and fileN does not have that line.</p>
\r
807 <p>In the above example output, the function signature was changed
\r
808 from both files (hence two <tt>-</tt> removals from both file1 and
\r
809 file2, plus <tt>++</tt> to mean one line that was added does not appear
\r
810 in either file1 nor file2). Also two other lines are the same
\r
811 from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
\r
812 <p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
\r
813 merge commit with the merge result (i.e. file1..fileN are the
\r
814 parents). When shown by <tt>git diff-files -c</tt>, it compares the
\r
815 two unresolved merge parents with the working tree file
\r
816 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
\r
817 "their version").</p>
\r
820 <div class="sectionbody">
\r
821 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
823 <h2>Documentation</h2>
\r
824 <div class="sectionbody">
\r
825 <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
828 <div class="sectionbody">
\r
829 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
832 <div id="footer-text">
\r
833 Last updated 15-Apr-2006 06:17:14 UTC
\r
projects / git.git / blob