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-stages(1)</title>
\r
264 git-diff-stages(1) Manual Page
\r
267 <div class="sectionbody">
\r
268 <p>git-diff-stages -
\r
269 Compares content and mode of blobs between stages in an unmerged index file
\r
274 <div class="sectionbody">
\r
275 <p><em>git-diff-stages</em> [<common diff options>] <stage1> <stage2> [<path>…]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Compares the content and mode of the blobs in two stages in an
\r
280 unmerged index file.</p>
\r
283 <div class="sectionbody">
\r
290 Generate patch (see section on generating patches)
\r
306 Generate patch but keep also the default raw diff output.
\r
314 Generate a diffstat instead of a patch.
\r
322 Output a condensed summary of extended header information
\r
323 such as creations, renames and mode changes.
\r
331 Generate patch and prepend its diffstat.
\r
339 \0 line termination on output
\r
347 Show only names of changed files.
\r
355 Show only names and status of changed files.
\r
363 Instead of the first handful characters, show full
\r
364 object name of pre- and post-image blob on the "index"
\r
365 line when generating a patch format output.
\r
369 --abbrev[=<n>]
\r
373 Instead of showing the full 40-byte hexadecimal object
\r
374 name in diff-raw format output and diff-tree header
\r
375 lines, show only handful hexdigits prefix. This is
\r
376 independent of --full-index option above, which controls
\r
377 the diff-patch output format. Non default number of
\r
378 digits can be specified with --abbrev=<n>.
\r
386 Break complete rewrite changes into pairs of delete and create.
\r
402 Detect copies as well as renames.
\r
406 --diff-filter=[ACDMRTUXB*]
\r
410 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
\r
411 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
\r
412 type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
\r
413 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
\r
414 Any combination of the filter characters may be used.
\r
415 When <tt>*</tt> (All-or-none) is added to the combination, all
\r
416 paths are selected if there is any file that matches
\r
417 other criteria in the comparison; if there is no file
\r
418 that matches other criteria, nothing is selected.
\r
422 --find-copies-harder
\r
426 For performance reasons, by default, -C option finds copies only
\r
427 if the original file of the copy was modified in the same
\r
428 changeset. This flag makes the command
\r
429 inspect unmodified files as candidates for the source of
\r
430 copy. This is a very expensive operation for large
\r
431 projects, so use it with caution.
\r
439 -M and -C options require O(n^2) processing time where n
\r
440 is the number of potential rename/copy targets. This
\r
441 option prevents rename/copy detection from running if
\r
442 the number of rename/copy targets exceeds the specified
\r
451 Look for differences that contain the change in <string>.
\r
459 When -S finds a change, show all the changes in that
\r
460 changeset, not just the files that contain the change
\r
469 Make the <string> not a plain string but an extended POSIX
\r
474 -O<orderfile>
\r
478 Output the patch in the order specified in the
\r
479 <orderfile>, which has one shell glob pattern per line.
\r
487 Swap two inputs; that is, show differences from index or
\r
488 on-disk file to tree contents.
\r
492 <p>For more detailed explanation on these common options, see also
\r
493 <a href="diffcore.html">diffcore documentation</a>.</p>
\r
496 <stage1>,<stage2>
\r
500 The stage number to be compared.
\r
505 <h2>Output format</h2>
\r
506 <div class="sectionbody">
\r
507 <p>The output format from "git-diff-index", "git-diff-tree" and
\r
508 "git-diff-files" are very similar.</p>
\r
509 <p>These commands all compare two sets of things; what is
\r
510 compared differs:</p>
\r
513 git-diff-index <tree-ish>
\r
517 compares the <tree-ish> and the files on the filesystem.
\r
521 git-diff-index --cached <tree-ish>
\r
525 compares the <tree-ish> and the index.
\r
529 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
\r
533 compares the trees named by the two arguments.
\r
537 git-diff-files [<pattern>…]
\r
541 compares the index and the files on the filesystem.
\r
545 <p>An output line is formatted this way:</p>
\r
546 <div class="listingblock">
\r
547 <div class="content">
\r
548 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
\r
549 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
\r
550 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
\r
551 create :000000 100644 0000000... 1234567... A file4
\r
552 delete :100644 000000 1234567... 0000000... D file5
\r
553 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
\r
555 <p>That is, from the left to the right:</p>
\r
564 mode for "src"; 000000 if creation or unmerged.
\r
574 mode for "dst"; 000000 if deletion or unmerged.
\r
584 sha1 for "src"; 0{40} if creation or unmerged.
\r
594 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
\r
604 status, followed by optional "score" number.
\r
609 a tab or a NUL when <em>-z</em> option is used.
\r
619 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
\r
624 path for "dst"; only exists for C or R.
\r
629 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
\r
633 <p><sha1> is shown as all 0's if a file is new on the filesystem
\r
634 and it is out of sync with the index.</p>
\r
636 <div class="listingblock">
\r
637 <div class="content">
\r
638 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
\r
640 <p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
\r
641 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
644 <h2>Generating patches with -p</h2>
\r
645 <div class="sectionbody">
\r
646 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
\r
647 with a <em>-p</em> option, they do not produce the output described above;
\r
648 instead they produce a patch file.</p>
\r
649 <p>The patch generation can be customized at two levels.</p>
\r
653 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is not set,
\r
654 these commands internally invoke "diff" like this:
\r
656 <div class="literalblock">
\r
657 <div class="content">
\r
658 <pre><tt>diff -L a/<path> -L b/<path> -pu <old> <new></tt></pre>
\r
660 <p>For added files, <tt>/dev/null</tt> is used for <old>. For removed
\r
661 files, <tt>/dev/null</tt> is used for <new></p>
\r
662 <p>The "diff" formatting options can be customized via the
\r
663 environment variable <em>GIT_DIFF_OPTS</em>. For example, if you
\r
664 prefer context diff:</p>
\r
665 <div class="literalblock">
\r
666 <div class="content">
\r
667 <pre><tt>GIT_DIFF_OPTS=-c git-diff-index -p HEAD</tt></pre>
\r
672 When the environment variable <em>GIT_EXTERNAL_DIFF</em> is set, the
\r
673 program named by it is called, instead of the diff invocation
\r
676 <p>For a path that is added, removed, or modified,
\r
677 <em>GIT_EXTERNAL_DIFF</em> is called with 7 parameters:</p>
\r
678 <div class="literalblock">
\r
679 <div class="content">
\r
680 <pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
\r
683 <div class="hlist"><table>
\r
685 <td class="hlist1">
\r
686 <old|new>-file
\r
688 <td class="hlist2">
\r
689 are files GIT_EXTERNAL_DIFF can use to read the
\r
690 contents of <old|new>,
\r
694 <td class="hlist1">
\r
695 <old|new>-hex
\r
697 <td class="hlist2">
\r
698 are the 40-hexdigit SHA1 hashes,
\r
702 <td class="hlist1">
\r
703 <old|new>-mode
\r
705 <td class="hlist2">
\r
706 are the octal representation of the file modes.
\r
710 <p>The file parameters can point at the user's working file
\r
711 (e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
\r
712 when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
\r
713 index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
\r
714 temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p>
\r
717 <p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
\r
718 parameter, <path>.</p>
\r
720 <h2>git specific extension to diff format</h2>
\r
721 <div class="sectionbody">
\r
722 <p>What -p option produces is slightly different from the
\r
723 traditional diff format.</p>
\r
727 It is preceded with a "git diff" header, that looks like
\r
730 <div class="literalblock">
\r
731 <div class="content">
\r
732 <pre><tt>diff --git a/file1 b/file2</tt></pre>
\r
734 <p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
\r
735 involved. Especially, even for a creation or a deletion,
\r
736 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
\r
737 <p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
\r
738 name of the source file of the rename/copy and the name of
\r
739 the file that rename/copy produces, respectively.</p>
\r
743 It is followed by one or more extended header lines:
\r
745 <div class="literalblock">
\r
746 <div class="content">
\r
747 <pre><tt>old mode <mode>
\r
748 new mode <mode>
\r
749 deleted file mode <mode>
\r
750 new file mode <mode>
\r
751 copy from <path>
\r
752 copy to <path>
\r
753 rename from <path>
\r
754 rename to <path>
\r
755 similarity index <number>
\r
756 dissimilarity index <number>
\r
757 index <hash>..<hash> <mode></tt></pre>
\r
762 TAB, LF, and backslash characters in pathnames are
\r
763 represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.
\r
768 <h2>combined diff format</h2>
\r
769 <div class="sectionbody">
\r
770 <p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option
\r
771 to produce <em>combined diff</em>, which looks like this:</p>
\r
772 <div class="listingblock">
\r
773 <div class="content">
\r
774 <pre><tt>diff --combined describe.c
\r
776 return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
\r
779 - static void describe(char *arg)
\r
780 -static void describe(struct commit *cmit, int last_one)
\r
781 ++static void describe(char *arg, int last_one)
\r
783 + unsigned char sha1[20];
\r
784 + struct commit *cmit;</tt></pre>
\r
786 <p>Unlike the traditional <em>unified</em> diff format, which shows two
\r
787 files A and B with a single column that has <tt>-</tt> (minus —
\r
788 appears in A but removed in B), <tt>+</tt> (plus — missing in A but
\r
789 added to B), or <tt> </tt> (space — unchanged) prefix, this format
\r
790 compares two or more files file1, file2,… with one file X, and
\r
791 shows how X differs from each of fileN. One column for each of
\r
792 fileN is prepended to the output line to note how X's line is
\r
793 different from it.</p>
\r
794 <p>A <tt>-</tt> character in the column N means that the line appears in
\r
795 fileN but it does not appear in the last file. A <tt>+</tt> character
\r
796 in the column N means that the line appears in the last file,
\r
797 and fileN does not have that line.</p>
\r
798 <p>In the above example output, the function signature was changed
\r
799 from both files (hence two <tt>-</tt> removals from both file1 and
\r
800 file2, plus <tt>++</tt> to mean one line that was added does not appear
\r
801 in either file1 nor file2). Also two other lines are the same
\r
802 from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
\r
803 <p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
\r
804 merge commit with the merge result (i.e. file1..fileN are the
\r
805 parents). When shown by <tt>git diff-files -c</tt>, it compares the
\r
806 two unresolved merge parents with the working tree file
\r
807 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
\r
808 "their version").</p>
\r
811 <div class="sectionbody">
\r
812 <p>Written by Junio C Hamano <junkio@cox.net></p>
\r
814 <h2>Documentation</h2>
\r
815 <div class="sectionbody">
\r
816 <p>Documentation by Junio C Hamano.</p>
\r
819 <div class="sectionbody">
\r
820 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
823 <div id="footer-text">
\r
824 Last updated 17-May-2006 10:34:01 UTC
\r
projects / git.git / blob