| blob | 4246542011b93288d36217bf91987ac7b702a0eb |
5 <head>
10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
12 /* Default font. */
13 body {
14 font-family: Georgia,serif;
15 }
17 /* Title font. */
18 h1, h2, h3, h4, h5, h6,
19 div.title, caption.title,
20 thead, p.table.header,
21 #toctitle,
22 #author, #revnumber, #revdate, #revremark,
23 #footer {
24 font-family: Arial,Helvetica,sans-serif;
25 }
27 body {
29 }
31 a {
32 color: blue;
33 text-decoration: underline;
34 }
35 a:visited {
36 color: fuchsia;
37 }
39 em {
40 font-style: italic;
41 color: navy;
42 }
44 strong {
45 font-weight: bold;
46 color: #083194;
47 }
49 h1, h2, h3, h4, h5, h6 {
50 color: #527bbd;
51 margin-top: 1.2em;
52 margin-bottom: 0.5em;
53 line-height: 1.3;
54 }
56 h1, h2, h3 {
57 border-bottom: 2px solid silver;
58 }
59 h2 {
60 padding-top: 0.5em;
61 }
62 h3 {
63 float: left;
64 }
65 h3 + * {
66 clear: left;
67 }
68 h5 {
69 font-size: 1.0em;
70 }
72 div.sectionbody {
73 margin-left: 0;
74 }
76 hr {
77 border: 1px solid silver;
78 }
80 p {
81 margin-top: 0.5em;
82 margin-bottom: 0.5em;
83 }
85 ul, ol, li > p {
86 margin-top: 0;
87 }
88 ul > li { color: #aaa; }
91 .monospaced, code, pre {
92 font-family: "Courier New", Courier, monospace;
93 font-size: inherit;
94 color: navy;
95 padding: 0;
96 margin: 0;
97 }
98 pre {
99 white-space: pre-wrap;
100 }
102 #author {
103 color: #527bbd;
104 font-weight: bold;
105 font-size: 1.1em;
106 }
107 #email {
108 }
109 #revnumber, #revdate, #revremark {
110 }
112 #footer {
113 font-size: small;
114 border-top: 2px solid silver;
115 padding-top: 0.5em;
116 margin-top: 4.0em;
117 }
118 #footer-text {
119 float: left;
120 padding-bottom: 0.5em;
121 }
122 #footer-badges {
123 float: right;
124 padding-bottom: 0.5em;
125 }
127 #preamble {
128 margin-top: 1.5em;
129 margin-bottom: 1.5em;
130 }
131 div.imageblock, div.exampleblock, div.verseblock,
132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133 div.admonitionblock {
134 margin-top: 1.0em;
135 margin-bottom: 1.5em;
136 }
137 div.admonitionblock {
138 margin-top: 2.0em;
139 margin-bottom: 2.0em;
140 margin-right: 10%;
141 color: #606060;
142 }
144 div.content { /* Block element content. */
145 padding: 0;
146 }
148 /* Block element titles. */
149 div.title, caption.title {
150 color: #527bbd;
151 font-weight: bold;
152 text-align: left;
153 margin-top: 1.0em;
154 margin-bottom: 0.5em;
155 }
156 div.title + * {
157 margin-top: 0;
158 }
160 td div.title:first-child {
161 margin-top: 0.0em;
162 }
163 div.content div.title:first-child {
164 margin-top: 0.0em;
165 }
166 div.content + div.title {
167 margin-top: 0.0em;
168 }
170 div.sidebarblock > div.content {
171 background: #ffffee;
172 border: 1px solid #dddddd;
173 border-left: 4px solid #f0f0f0;
174 padding: 0.5em;
175 }
177 div.listingblock > div.content {
178 border: 1px solid #dddddd;
179 border-left: 5px solid #f0f0f0;
180 background: #f8f8f8;
181 padding: 0.5em;
182 }
184 div.quoteblock, div.verseblock {
185 padding-left: 1.0em;
186 margin-left: 1.0em;
187 margin-right: 10%;
188 border-left: 5px solid #f0f0f0;
189 color: #888;
190 }
192 div.quoteblock > div.attribution {
193 padding-top: 0.5em;
194 text-align: right;
195 }
197 div.verseblock > pre.content {
198 font-family: inherit;
199 font-size: inherit;
200 }
201 div.verseblock > div.attribution {
202 padding-top: 0.75em;
203 text-align: left;
204 }
205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
206 div.verseblock + div.attribution {
207 text-align: left;
208 }
210 div.admonitionblock .icon {
211 vertical-align: top;
212 font-size: 1.1em;
213 font-weight: bold;
214 text-decoration: underline;
215 color: #527bbd;
216 padding-right: 0.5em;
217 }
218 div.admonitionblock td.content {
219 padding-left: 0.5em;
220 border-left: 3px solid #dddddd;
221 }
223 div.exampleblock > div.content {
224 border-left: 3px solid #dddddd;
225 padding-left: 0.5em;
226 }
228 div.imageblock div.content { padding-left: 0; }
229 span.image img { border-style: none; vertical-align: text-bottom; }
230 a.image:visited { color: white; }
232 dl {
233 margin-top: 0.8em;
234 margin-bottom: 0.8em;
235 }
236 dt {
237 margin-top: 0.5em;
238 margin-bottom: 0;
239 font-style: normal;
240 color: navy;
241 }
242 dd > *:first-child {
243 margin-top: 0.1em;
244 }
246 ul, ol {
247 list-style-position: outside;
248 }
249 ol.arabic {
250 list-style-type: decimal;
251 }
252 ol.loweralpha {
253 list-style-type: lower-alpha;
254 }
255 ol.upperalpha {
256 list-style-type: upper-alpha;
257 }
258 ol.lowerroman {
259 list-style-type: lower-roman;
260 }
261 ol.upperroman {
262 list-style-type: upper-roman;
263 }
265 div.compact ul, div.compact ol,
266 div.compact p, div.compact p,
267 div.compact div, div.compact div {
268 margin-top: 0.1em;
269 margin-bottom: 0.1em;
270 }
272 tfoot {
273 font-weight: bold;
274 }
275 td > div.verse {
276 white-space: pre;
277 }
279 div.hdlist {
280 margin-top: 0.8em;
281 margin-bottom: 0.8em;
282 }
283 div.hdlist tr {
284 padding-bottom: 15px;
285 }
286 dt.hdlist1.strong, td.hdlist1.strong {
287 font-weight: bold;
288 }
289 td.hdlist1 {
290 vertical-align: top;
291 font-style: normal;
292 padding-right: 0.8em;
293 color: navy;
294 }
295 td.hdlist2 {
296 vertical-align: top;
297 }
298 div.hdlist.compact tr {
299 margin: 0;
300 padding-bottom: 0;
301 }
303 .comment {
304 background: yellow;
305 }
307 .footnote, .footnoteref {
308 font-size: 0.8em;
309 }
311 span.footnote, span.footnoteref {
312 vertical-align: super;
313 }
315 #footnotes {
318 }
320 #footnotes div.footnote {
322 }
324 #footnotes hr {
325 border: none;
326 border-top: 1px solid silver;
327 height: 1px;
328 text-align: left;
329 margin-left: 0;
330 width: 20%;
331 min-width: 100px;
332 }
334 div.colist td {
335 padding-right: 0.5em;
336 padding-bottom: 0.3em;
337 vertical-align: top;
338 }
339 div.colist td img {
340 margin-top: 0.3em;
341 }
343 @media print {
344 #footer-badges { display: none; }
345 }
347 #toc {
348 margin-bottom: 2.5em;
349 }
351 #toctitle {
352 color: #527bbd;
353 font-size: 1.1em;
354 font-weight: bold;
355 margin-top: 1.0em;
356 margin-bottom: 0.1em;
357 }
359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
360 margin-top: 0;
361 margin-bottom: 0;
362 }
363 div.toclevel2 {
364 margin-left: 2em;
365 font-size: 0.9em;
366 }
367 div.toclevel3 {
368 margin-left: 4em;
369 font-size: 0.9em;
370 }
371 div.toclevel4 {
372 margin-left: 6em;
373 font-size: 0.9em;
374 }
376 span.aqua { color: aqua; }
377 span.black { color: black; }
378 span.blue { color: blue; }
379 span.fuchsia { color: fuchsia; }
380 span.gray { color: gray; }
381 span.green { color: green; }
382 span.lime { color: lime; }
383 span.maroon { color: maroon; }
384 span.navy { color: navy; }
385 span.olive { color: olive; }
386 span.purple { color: purple; }
387 span.red { color: red; }
388 span.silver { color: silver; }
389 span.teal { color: teal; }
390 span.white { color: white; }
391 span.yellow { color: yellow; }
393 span.aqua-background { background: aqua; }
394 span.black-background { background: black; }
395 span.blue-background { background: blue; }
396 span.fuchsia-background { background: fuchsia; }
397 span.gray-background { background: gray; }
398 span.green-background { background: green; }
399 span.lime-background { background: lime; }
400 span.maroon-background { background: maroon; }
401 span.navy-background { background: navy; }
402 span.olive-background { background: olive; }
403 span.purple-background { background: purple; }
404 span.red-background { background: red; }
405 span.silver-background { background: silver; }
406 span.teal-background { background: teal; }
407 span.white-background { background: white; }
408 span.yellow-background { background: yellow; }
410 span.big { font-size: 2em; }
411 span.small { font-size: 0.6em; }
413 span.underline { text-decoration: underline; }
414 span.overline { text-decoration: overline; }
415 span.line-through { text-decoration: line-through; }
417 div.unbreakable { page-break-inside: avoid; }
420 /*
421 * xhtml11 specific
422 *
423 * */
425 div.tableblock {
426 margin-top: 1.0em;
427 margin-bottom: 1.5em;
428 }
429 div.tableblock > table {
431 }
432 thead, p.table.header {
433 font-weight: bold;
434 color: #527bbd;
435 }
436 p.table {
437 margin-top: 0;
438 }
439 /* Because the table frame attribute is overridden by CSS in most browsers. */
441 border-style: none;
442 }
444 border-left-style: none;
445 border-right-style: none;
446 }
448 border-top-style: none;
449 border-bottom-style: none;
450 }
453 /*
454 * html5 specific
455 *
456 * */
458 table.tableblock {
459 margin-top: 1.0em;
460 margin-bottom: 1.5em;
461 }
462 thead, p.tableblock.header {
463 font-weight: bold;
464 color: #527bbd;
465 }
466 p.tableblock {
467 margin-top: 0;
468 }
469 table.tableblock {
470 border-width: 3px;
471 border-spacing: 0px;
472 border-style: solid;
473 border-color: #527bbd;
474 border-collapse: collapse;
475 }
476 th.tableblock, td.tableblock {
477 border-width: 1px;
478 padding: 4px;
479 border-style: solid;
480 border-color: #527bbd;
481 }
483 table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
486 }
487 table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
490 }
491 table.tableblock.frame-none {
492 border-style: hidden;
493 }
495 th.tableblock.halign-left, td.tableblock.halign-left {
496 text-align: left;
497 }
498 th.tableblock.halign-center, td.tableblock.halign-center {
499 text-align: center;
500 }
501 th.tableblock.halign-right, td.tableblock.halign-right {
502 text-align: right;
503 }
505 th.tableblock.valign-top, td.tableblock.valign-top {
506 vertical-align: top;
507 }
508 th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
510 }
511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
513 }
516 /*
517 * manpage specific
518 *
519 * */
521 body.manpage h1 {
522 padding-top: 0.5em;
523 padding-bottom: 0.5em;
524 border-top: 2px solid silver;
525 border-bottom: 2px solid silver;
526 }
527 body.manpage h2 {
528 border-style: none;
529 }
530 body.manpage div.sectionbody {
531 margin-left: 3em;
532 }
534 @media print {
535 body.manpage div#toc { display: none; }
536 }
539 </style>
541 /*<![CDATA[*/
542 var asciidoc = { // Namespace.
544 /////////////////////////////////////////////////////////////////////
545 // Table Of Contents generator
546 /////////////////////////////////////////////////////////////////////
548 /* Author: Mihai Bazon, September 2002
549 * http://students.infoiasi.ro/~mishoo
550 *
551 * Table Of Content generator
552 * Version: 0.4
553 *
554 * Feel free to use this script under the terms of the GNU General Public
555 * License, as long as you do not remove or alter this notice.
556 */
558 /* modified by Troy D. Hanson, September 2006. License: GPL */
562 toc: function (toclevels) {
564 function getText(el) {
565 var text = "";
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
568 text += i.data;
569 else if (i.firstChild != null)
570 text += getText(i);
571 }
572 return text;
573 }
575 function TocEntry(el, text, toclevel) {
576 this.element = el;
577 this.text = text;
578 this.toclevel = toclevel;
579 }
581 function tocEntries(el, toclevels) {
582 var result = new Array;
584 // Function that scans the DOM tree for header elements (the DOM2
585 // nodeIterator API would be a better technique but not supported by all
586 // browsers).
587 var iterate = function (el) {
588 for (var i = el.firstChild; i != null; i = i.nextSibling) {
589 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
590 var mo = re.exec(i.tagName);
593 }
594 iterate(i);
595 }
596 }
597 }
598 iterate(el);
599 return result;
600 }
602 var toc = document.getElementById("toc");
603 if (!toc) {
604 return;
605 }
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
609 var i;
610 for (i = 0; i < toc.childNodes.length; i++) {
611 var entry = toc.childNodes[i];
612 if (entry.nodeName.toLowerCase() == 'div'
613 && entry.getAttribute("class")
614 && entry.getAttribute("class").match(/^toclevel/))
615 tocEntriesToRemove.push(entry);
616 }
617 for (i = 0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
619 }
621 // Rebuild TOC entries.
622 var entries = tocEntries(document.getElementById("content"), toclevels);
623 for (var i = 0; i < entries.length; ++i) {
624 var entry = entries[i];
625 if (entry.element.id == "")
626 entry.element.id = "_toc_" + i;
627 var a = document.createElement("a");
628 a.href = "#" + entry.element.id;
629 a.appendChild(document.createTextNode(entry.text));
630 var div = document.createElement("div");
631 div.appendChild(a);
632 div.className = "toclevel" + entry.toclevel;
633 toc.appendChild(div);
634 }
635 if (entries.length == 0)
636 toc.parentNode.removeChild(toc);
637 },
640 /////////////////////////////////////////////////////////////////////
641 // Footnotes generator
642 /////////////////////////////////////////////////////////////////////
644 /* Based on footnote generation code from:
646 */
648 footnotes: function () {
649 // Delete existing footnote entries in case we're reloading the footnodes.
650 var i;
651 var noteholder = document.getElementById("footnotes");
652 if (!noteholder) {
653 return;
654 }
655 var entriesToRemove = [];
656 for (i = 0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
659 entriesToRemove.push(entry);
660 }
661 for (i = 0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
663 }
665 // Rebuild footnote entries.
666 var cont = document.getElementById("content");
667 var spans = cont.getElementsByTagName("span");
668 var refs = {};
669 var n = 0;
671 if (spans[i].className == "footnote") {
672 n++;
673 var note = spans[i].getAttribute("data-note");
674 if (!note) {
675 // Use [\s\S] in place of . so multi-line matches work.
676 // Because JavaScript has no s (dotall) regex flag.
677 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
678 spans[i].innerHTML =
681 spans[i].setAttribute("data-note", note);
682 }
683 noteholder.innerHTML +=
687 var id =spans[i].getAttribute("id");
688 if (id != null) refs["#"+id] = n;
689 }
690 }
691 if (n == 0)
692 noteholder.parentNode.removeChild(noteholder);
693 else {
694 // Process footnoterefs.
696 if (spans[i].className == "footnoteref") {
698 href = href.match(/#.*/)[0]; // Because IE return full URL.
699 n = refs[href];
700 spans[i].innerHTML =
701 "[<a href='#_footnote_" + n +
703 }
704 }
705 }
706 },
708 install: function(toclevels) {
709 var timerId;
711 function reinstall() {
712 asciidoc.footnotes();
713 if (toclevels) {
714 asciidoc.toc(toclevels);
715 }
716 }
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
720 reinstall();
721 }
723 timerId = setInterval(reinstall, 500);
724 if (document.addEventListener)
725 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
726 else
727 window.onload = reinstallAndRemoveTimer;
728 }
730 }
731 asciidoc.install();
732 /*]]>*/
733 </script>
734 </head>
737 <h1>
738 git-diff-files(1) Manual Page
739 </h1>
742 <p>git-diff-files -
743 Compares files in the working tree and the index
744 </p>
745 </div>
746 </div>
752 <pre class="content"><em>git diff-files</em> [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>…]</pre>
754 </div></div>
755 </div>
756 </div>
761 are specified, compares only those named paths. Otherwise all
762 entries in the index are compared. The output format is the
764 </div>
765 </div>
771 -p
772 </dt>
774 -u
775 </dt>
777 --patch
778 </dt>
779 <dd>
780 <p>
781 Generate patch (see section titled
782 "Generating patch text with -p").
783 </p>
784 </dd>
786 -s
787 </dt>
789 --no-patch
790 </dt>
791 <dd>
792 <p>
793 Suppress all output from the diff machinery. Useful for
795 squelch their output, or to cancel the effect of options like
797 </p>
798 </dd>
801 </dt>
804 </dt>
805 <dd>
806 <p>
808 the usual three.
810 </p>
811 </dd>
814 </dt>
815 <dd>
816 <p>
817 Output to a specific file instead of stdout.
818 </p>
819 </dd>
822 </dt>
825 </dt>
828 </dt>
829 <dd>
830 <p>
831 Specify the character used to indicate new, old or context
833 ' ' respectively.
834 </p>
835 </dd>
837 --raw
838 </dt>
839 <dd>
840 <p>
841 Generate the diff in raw format.
842 This is the default.
843 </p>
844 </dd>
846 --patch-with-raw
847 </dt>
848 <dd>
849 <p>
851 </p>
852 </dd>
854 --indent-heuristic
855 </dt>
856 <dd>
857 <p>
858 Enable the heuristic that shifts diff hunk boundaries to make patches
859 easier to read. This is the default.
860 </p>
861 </dd>
863 --no-indent-heuristic
864 </dt>
865 <dd>
866 <p>
867 Disable the indent heuristic.
868 </p>
869 </dd>
871 --minimal
872 </dt>
873 <dd>
874 <p>
875 Spend extra time to make sure the smallest possible
876 diff is produced.
877 </p>
878 </dd>
880 --patience
881 </dt>
882 <dd>
883 <p>
884 Generate a diff using the "patience diff" algorithm.
885 </p>
886 </dd>
888 --histogram
889 </dt>
890 <dd>
891 <p>
892 Generate a diff using the "histogram diff" algorithm.
893 </p>
894 </dd>
897 </dt>
898 <dd>
899 <p>
900 Generate a diff using the "anchored diff" algorithm.
901 </p>
903 <div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
904 and starts with this text, this algorithm attempts to prevent it from
905 appearing as a deletion or addition in the output. It uses the "patience
907 </dd>
909 --diff-algorithm={patience|minimal|histogram|myers}
910 </dt>
911 <dd>
912 <p>
913 Choose a diff algorithm. The variants are as follows:
914 </p>
920 </dt>
921 <dd>
922 <p>
923 The basic greedy diff algorithm. Currently, this is the default.
924 </p>
925 </dd>
928 </dt>
929 <dd>
930 <p>
931 Spend extra time to make sure the smallest possible diff is
932 produced.
933 </p>
934 </dd>
937 </dt>
938 <dd>
939 <p>
940 Use "patience diff" algorithm when generating patches.
941 </p>
942 </dd>
945 </dt>
946 <dd>
947 <p>
948 This algorithm extends the patience algorithm to "support
949 low-occurrence common elements".
950 </p>
951 </dd>
952 </dl></div>
953 </div></div>
954 <div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
955 non-default value and want to use the default one, then you
957 </dd>
960 </dt>
961 <dd>
962 <p>
963 Generate a diffstat. By default, as much space as necessary
964 will be used for the filename part, and the rest for the graph
965 part. Maximum width defaults to terminal width, or 80 columns
966 if not connected to a terminal, and can be overridden by
969 of the graph part can be limited by using
975 there are more.
976 </p>
977 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
978 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
979 </dd>
981 --compact-summary
982 </dt>
983 <dd>
984 <p>
985 Output a condensed summary of extended header information such
988 or removing executable bit respectively) in diffstat. The
989 information is put between the filename part and the graph
991 </p>
992 </dd>
994 --numstat
995 </dt>
996 <dd>
997 <p>
999 deleted lines in decimal notation and pathname without
1000 abbreviation, to make it more machine friendly. For
1003 </p>
1004 </dd>
1006 --shortstat
1007 </dt>
1008 <dd>
1009 <p>
1011 number of modified files, as well as number of added and deleted
1012 lines.
1013 </p>
1014 </dd>
1017 </dt>
1020 </dt>
1021 <dd>
1022 <p>
1023 Output the distribution of relative amount of changes for each
1025 passing it a comma separated list of parameters.
1028 The following parameters are available:
1029 </p>
1035 </dt>
1036 <dd>
1037 <p>
1038 Compute the dirstat numbers by counting the lines that have been
1039 removed from the source, or added to the destination. This ignores
1040 the amount of pure code movements within a file. In other words,
1041 rearranging lines in a file is not counted as much as other changes.
1042 This is the default behavior when no parameter is given.
1043 </p>
1044 </dd>
1047 </dt>
1048 <dd>
1049 <p>
1050 Compute the dirstat numbers by doing the regular line-based diff
1051 analysis, and summing the removed/added line counts. (For binary
1052 files, count 64-byte chunks instead, since binary files have no
1055 lines within a file as much as other changes. The resulting output
1057 </p>
1058 </dd>
1061 </dt>
1062 <dd>
1063 <p>
1064 Compute the dirstat numbers by counting the number of files changed.
1065 Each changed file counts equally in the dirstat analysis. This is
1067 not have to look at the file contents at all.
1068 </p>
1069 </dd>
1072 </dt>
1073 <dd>
1074 <p>
1075 Count changes in a child directory for the parent directory as well.
1077 reported may exceed 100%. The default (non-cumulative) behavior can
1079 </p>
1080 </dd>
1083 </dt>
1084 <dd>
1085 <p>
1086 An integer parameter specifies a cut-off percent (3% by default).
1087 Directories contributing less than this percentage of the changes
1088 are not shown in the output.
1089 </p>
1090 </dd>
1091 </dl></div>
1092 </div></div>
1094 directories with less than 10% of the total amount of changed files,
1095 and accumulating child directory counts in the parent directories:
1097 </dd>
1099 --cumulative
1100 </dt>
1101 <dd>
1102 <p>
1103 Synonym for --dirstat=cumulative
1104 </p>
1105 </dd>
1108 </dt>
1109 <dd>
1110 <p>
1111 Synonym for --dirstat=files,param1,param2…
1112 </p>
1113 </dd>
1115 --summary
1116 </dt>
1117 <dd>
1118 <p>
1119 Output a condensed summary of extended header information
1120 such as creations, renames and mode changes.
1121 </p>
1122 </dd>
1124 --patch-with-stat
1125 </dt>
1126 <dd>
1127 <p>
1129 </p>
1130 </dd>
1132 -z
1133 </dt>
1134 <dd>
1135 <p>
1136 When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
1137 given, do not munge pathnames and use NULs as output field terminators.
1138 </p>
1139 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1142 </dd>
1144 --name-only
1145 </dt>
1146 <dd>
1147 <p>
1148 Show only names of changed files. The file names are often encoded in UTF-8.
1149 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1150 manual page.
1151 </p>
1152 </dd>
1154 --name-status
1155 </dt>
1156 <dd>
1157 <p>
1158 Show only names and status of changed files. See the description
1161 </p>
1162 </dd>
1165 </dt>
1166 <dd>
1167 <p>
1168 Specify how differences in submodules are shown. When specifying
1170 shows the names of the commits at the beginning and end of the range.
1172 format is used. This format lists the commits in the range like
1173 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1175 inline diff of the changes in the submodule contents between the
1177 if the config option is unset.
1178 </p>
1179 </dd>
1182 </dt>
1183 <dd>
1184 <p>
1185 Show colored diff.
1186 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
1187 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
1188 </p>
1189 </dd>
1191 --no-color
1192 </dt>
1193 <dd>
1194 <p>
1195 Turn off colored diff.
1197 </p>
1198 </dd>
1201 </dt>
1202 <dd>
1203 <p>
1204 Moved lines of code are colored differently.
1207 The mode must be one of:
1208 </p>
1213 no
1214 </dt>
1215 <dd>
1216 <p>
1217 Moved lines are not highlighted.
1218 </p>
1219 </dd>
1221 default
1222 </dt>
1223 <dd>
1224 <p>
1226 in the future.
1227 </p>
1228 </dd>
1230 plain
1231 </dt>
1232 <dd>
1233 <p>
1234 Any line that is added in one location and was removed
1237 that are added somewhere else in the diff. This mode picks up any
1238 moved line, but it is not very useful in a review to determine
1239 if a block of code was moved without permutation.
1240 </p>
1241 </dd>
1243 blocks
1244 </dt>
1245 <dd>
1246 <p>
1247 Blocks of moved text of at least 20 alphanumeric characters
1248 are detected greedily. The detected blocks are
1250 Adjacent blocks cannot be told apart.
1251 </p>
1252 </dd>
1254 zebra
1255 </dt>
1256 <dd>
1257 <p>
1261 the two colors indicates that a new block was detected.
1262 </p>
1263 </dd>
1265 dimmed-zebra
1266 </dt>
1267 <dd>
1268 <p>
1270 of moved code is performed. The bordering lines of two adjacent
1271 blocks are considered interesting, the rest is uninteresting.
1273 </p>
1274 </dd>
1275 </dl></div>
1276 </div></div>
1277 </dd>
1279 --no-color-moved
1280 </dt>
1281 <dd>
1282 <p>
1283 Turn off move detection. This can be used to override configuration
1285 </p>
1286 </dd>
1289 </dt>
1290 <dd>
1291 <p>
1292 This configures how whitespace is ignored when performing the
1294 These modes can be given as a comma separated list:
1295 </p>
1300 no
1301 </dt>
1302 <dd>
1303 <p>
1304 Do not ignore whitespace when performing move detection.
1305 </p>
1306 </dd>
1308 ignore-space-at-eol
1309 </dt>
1310 <dd>
1311 <p>
1312 Ignore changes in whitespace at EOL.
1313 </p>
1314 </dd>
1316 ignore-space-change
1317 </dt>
1318 <dd>
1319 <p>
1320 Ignore changes in amount of whitespace. This ignores whitespace
1321 at line end, and considers all other sequences of one or
1322 more whitespace characters to be equivalent.
1323 </p>
1324 </dd>
1326 ignore-all-space
1327 </dt>
1328 <dd>
1329 <p>
1330 Ignore whitespace when comparing lines. This ignores differences
1331 even if one line has whitespace where the other line has none.
1332 </p>
1333 </dd>
1335 allow-indentation-change
1336 </dt>
1337 <dd>
1338 <p>
1339 Initially ignore any whitespace in the move detection, then
1340 group the moved code blocks only into a block if the change in
1341 whitespace is the same per line. This is incompatible with the
1342 other modes.
1343 </p>
1344 </dd>
1345 </dl></div>
1346 </div></div>
1347 </dd>
1349 --no-color-moved-ws
1350 </dt>
1351 <dd>
1352 <p>
1353 Do not ignore whitespace when performing move detection. This can be
1354 used to override configuration settings. It is the same as
1356 </p>
1357 </dd>
1360 </dt>
1361 <dd>
1362 <p>
1364 By default, words are delimited by whitespace; see
1366 must be one of:
1367 </p>
1372 color
1373 </dt>
1374 <dd>
1375 <p>
1377 </p>
1378 </dd>
1380 plain
1381 </dt>
1382 <dd>
1383 <p>
1385 attempts to escape the delimiters if they appear in the input,
1386 so the output may be ambiguous.
1387 </p>
1388 </dd>
1390 porcelain
1391 </dt>
1392 <dd>
1393 <p>
1394 Use a special line-based format intended for script
1395 consumption. Added/removed/unchanged runs are printed in the
1397 character at the beginning of the line and extending to the
1398 end of the line. Newlines in the input are represented by a
1400 </p>
1401 </dd>
1403 none
1404 </dt>
1405 <dd>
1406 <p>
1407 Disable word diff again.
1408 </p>
1409 </dd>
1410 </dl></div>
1411 </div></div>
1413 highlight the changed parts in all modes if enabled.</p></div>
1414 </dd>
1417 </dt>
1418 <dd>
1419 <p>
1421 runs of non-whitespace to be a word. Also implies
1423 </p>
1426 considered whitespace and ignored(!) for the purposes of finding
1428 expression to make sure that it matches all non-whitespace characters.
1429 A match that contains a newline is silently truncated(!) at the
1430 newline.</p></div>
1431 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1432 and, correspondingly, show differences character by character.</p></div>
1433 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1434 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
1435 overrides any diff driver or configuration setting. Diff drivers
1436 override configuration settings.</p></div>
1437 </dd>
1440 </dt>
1441 <dd>
1442 <p>
1445 </p>
1446 </dd>
1448 --no-renames
1449 </dt>
1450 <dd>
1451 <p>
1452 Turn off rename detection, even when the configuration
1453 file gives the default to do so.
1454 </p>
1455 </dd>
1457 --[no-]rename-empty
1458 </dt>
1459 <dd>
1460 <p>
1461 Whether to use empty blobs as rename source.
1462 </p>
1463 </dd>
1465 --check
1466 </dt>
1467 <dd>
1468 <p>
1469 Warn if changes introduce conflict markers or whitespace errors.
1471 configuration. By default, trailing whitespaces (including
1472 lines that consist solely of whitespaces) and a space character
1473 that is immediately followed by a tab character inside the
1474 initial indent of the line are considered whitespace errors.
1475 Exits with non-zero status if problems are found. Not compatible
1476 with --exit-code.
1477 </p>
1478 </dd>
1481 </dt>
1482 <dd>
1483 <p>
1485 lines of the diff. Multiple values are separated by comma,
1488 this option is not given, and the configuration variable
1492 </p>
1493 </dd>
1495 --full-index
1496 </dt>
1497 <dd>
1498 <p>
1499 Instead of the first handful of characters, show the full
1500 pre- and post-image blob object names on the "index"
1501 line when generating patch format output.
1502 </p>
1503 </dd>
1505 --binary
1506 </dt>
1507 <dd>
1508 <p>
1512 </p>
1513 </dd>
1516 </dt>
1517 <dd>
1518 <p>
1519 Instead of showing the full 40-byte hexadecimal object
1520 name in diff-raw format output and diff-tree header
1522 hexdigits long that uniquely refers the object.
1527 </p>
1528 </dd>
1531 </dt>
1534 </dt>
1535 <dd>
1536 <p>
1537 Break complete rewrite changes into pairs of delete and
1538 create. This serves two purposes:
1539 </p>
1540 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1541 not as a series of deletion and insertion mixed together with a very
1542 few lines that happen to match textually as the context, but as a
1543 single deletion of everything old followed by a single insertion of
1546 original should remain in the result for Git to consider it a total
1547 rewrite (i.e. otherwise the resulting patch will be a series of
1548 deletion and insertion mixed together with context lines).</p></div>
1549 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1550 source of a rename (usually -M only considers a file that disappeared
1554 eligible for being picked up as a possible source of a rename to
1555 another file.</p></div>
1556 </dd>
1559 </dt>
1562 </dt>
1563 <dd>
1564 <p>
1565 Detect renames.
1567 index (i.e. amount of addition/deletions compared to the
1569 delete/add pair to be a rename if more than 90% of the file
1575 </p>
1576 </dd>
1579 </dt>
1582 </dt>
1583 <dd>
1584 <p>
1587 </p>
1588 </dd>
1590 --find-copies-harder
1591 </dt>
1592 <dd>
1593 <p>
1595 if the original file of the copy was modified in the same
1596 changeset. This flag makes the command
1597 inspect unmodified files as candidates for the source of
1598 copy. This is a very expensive operation for large
1599 projects, so use it with caution. Giving more than one
1601 </p>
1602 </dd>
1604 -D
1605 </dt>
1607 --irreversible-delete
1608 </dt>
1609 <dd>
1610 <p>
1611 Omit the preimage for deletes, i.e. print only the header but not
1614 solely for people who want to just concentrate on reviewing the
1615 text after the change. In addition, the output obviously lacks
1616 enough information to apply such a patch in reverse, even manually,
1617 hence the name of the option.
1618 </p>
1619 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1620 of a delete/create pair.</p></div>
1621 </dd>
1624 </dt>
1625 <dd>
1626 <p>
1628 can detect subsets of renames/copies cheaply, followed by an
1629 exhaustive fallback portion that compares all remaining
1630 unpaired destinations to all relevant sources. (For renames,
1631 only remaining unpaired sources are relevant; for copies, all
1632 original sources are relevant.) For N sources and
1633 destinations, this exhaustive check is O(N^2). This option
1634 prevents the exhaustive portion of rename/copy detection from
1635 running if the number of source/destination files involved
1636 exceeds the specified number. Defaults to diff.renameLimit.
1637 Note that a value of 0 is treated as unlimited.
1638 </p>
1639 </dd>
1641 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1642 </dt>
1643 <dd>
1644 <p>
1650 Any combination of the filter characters (including none) can be used.
1652 paths are selected if there is any file that matches
1653 other criteria in the comparison; if there is no file
1654 that matches other criteria, nothing is selected.
1655 </p>
1658 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1659 renamed entries cannot appear if detection for those types is disabled.</p></div>
1660 </dd>
1663 </dt>
1664 <dd>
1665 <p>
1666 Look for differences that change the number of occurrences of
1667 the specified string (i.e. addition/deletion) in a file.
1668 Intended for the scripter’s use.
1669 </p>
1670 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
1671 struct), and want to know the history of that block since it first
1672 came into being: use the feature iteratively to feed the interesting
1674 very first version of the block.</p></div>
1676 </dd>
1679 </dt>
1680 <dd>
1681 <p>
1682 Look for differences whose patch text contains added/removed
1684 </p>
1685 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
1687 file:</p></div>
1691 ...
1693 </div></div>
1694 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1696 occurrences of that string did not change).</p></div>
1697 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1698 filter will be ignored.</p></div>
1699 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1700 information.</p></div>
1701 </dd>
1704 </dt>
1705 <dd>
1706 <p>
1707 Look for differences that change the number of occurrences of
1709 in that it doesn’t search for a specific string but for a specific
1710 object id.
1711 </p>
1712 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1714 </dd>
1716 --pickaxe-all
1717 </dt>
1718 <dd>
1719 <p>
1721 changeset, not just the files that contain the change
1723 </p>
1724 </dd>
1726 --pickaxe-regex
1727 </dt>
1728 <dd>
1729 <p>
1731 expression to match.
1732 </p>
1733 </dd>
1736 </dt>
1737 <dd>
1738 <p>
1739 Control the order in which files appear in the output.
1743 </p>
1746 All files with pathnames that match the first pattern are output
1747 first, all files with pathnames that match the second pattern (but not
1748 the first) are output next, and so on.
1749 All files with pathnames that do not match any pattern are output
1750 last, as if there was an implicit match-all pattern at the end of the
1751 file.
1752 If multiple pathnames have the same rank (they match the same pattern
1753 but no earlier patterns), their output order relative to each other is
1754 the normal order.</p></div>
1759 <li>
1760 <p>
1761 Blank lines are ignored, so they can be used as separators for
1762 readability.
1763 </p>
1764 </li>
1765 <li>
1766 <p>
1767 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1768 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1769 pattern if it starts with a hash.
1770 </p>
1771 </li>
1772 <li>
1773 <p>
1774 Each other line contains a single pattern.
1775 </p>
1776 </li>
1777 </ul></div>
1778 </div></div>
1780 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1781 matches a pattern if removing any number of the final pathname
1782 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1783 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
1784 </dd>
1787 </dt>
1790 </dt>
1791 <dd>
1792 <p>
1797 otherwise.
1798 </p>
1799 </dd>
1801 -R
1802 </dt>
1803 <dd>
1804 <p>
1805 Swap two inputs; that is, show differences from index or
1806 on-disk file to tree contents.
1807 </p>
1808 </dd>
1811 </dt>
1813 --no-relative
1814 </dt>
1815 <dd>
1816 <p>
1817 When run from a subdirectory of the project, it can be
1818 told to exclude changes outside the directory and show
1819 pathnames relative to it with this option. When you are
1820 not in a subdirectory (e.g. in a bare repository), you
1821 can name which subdirectory to make the output relative
1825 </p>
1826 </dd>
1828 -a
1829 </dt>
1831 --text
1832 </dt>
1833 <dd>
1834 <p>
1835 Treat all files as text.
1836 </p>
1837 </dd>
1839 --ignore-cr-at-eol
1840 </dt>
1841 <dd>
1842 <p>
1843 Ignore carriage-return at the end of line when doing a comparison.
1844 </p>
1845 </dd>
1847 --ignore-space-at-eol
1848 </dt>
1849 <dd>
1850 <p>
1851 Ignore changes in whitespace at EOL.
1852 </p>
1853 </dd>
1855 -b
1856 </dt>
1858 --ignore-space-change
1859 </dt>
1860 <dd>
1861 <p>
1862 Ignore changes in amount of whitespace. This ignores whitespace
1863 at line end, and considers all other sequences of one or
1864 more whitespace characters to be equivalent.
1865 </p>
1866 </dd>
1868 -w
1869 </dt>
1871 --ignore-all-space
1872 </dt>
1873 <dd>
1874 <p>
1875 Ignore whitespace when comparing lines. This ignores
1876 differences even if one line has whitespace where the other
1877 line has none.
1878 </p>
1879 </dd>
1881 --ignore-blank-lines
1882 </dt>
1883 <dd>
1884 <p>
1885 Ignore changes whose lines are all blank.
1886 </p>
1887 </dd>
1890 </dt>
1893 </dt>
1894 <dd>
1895 <p>
1897 be specified more than once.
1898 </p>
1899 </dd>
1902 </dt>
1903 <dd>
1904 <p>
1905 Show the context between diff hunks, up to the specified number
1906 of lines, thereby fusing hunks that are close to each other.
1908 is unset.
1909 </p>
1910 </dd>
1912 -W
1913 </dt>
1915 --function-context
1916 </dt>
1917 <dd>
1918 <p>
1919 Show whole function as context lines for each change.
1920 The function names are determined in the same way as
1923 </p>
1924 </dd>
1926 --exit-code
1927 </dt>
1928 <dd>
1929 <p>
1930 Make the program exit with codes similar to diff(1).
1931 That is, it exits with 1 if there were differences and
1932 0 means no differences.
1933 </p>
1934 </dd>
1936 --quiet
1937 </dt>
1938 <dd>
1939 <p>
1941 </p>
1942 </dd>
1944 --ext-diff
1945 </dt>
1946 <dd>
1947 <p>
1948 Allow an external diff helper to be executed. If you set an
1951 </p>
1952 </dd>
1954 --no-ext-diff
1955 </dt>
1956 <dd>
1957 <p>
1958 Disallow external diff drivers.
1959 </p>
1960 </dd>
1962 --textconv
1963 </dt>
1965 --no-textconv
1966 </dt>
1967 <dd>
1968 <p>
1969 Allow (or disallow) external text conversion filters to be run
1971 details. Because textconv filters are typically a one-way
1972 conversion, the resulting diff is suitable for human
1973 consumption, but cannot be applied. For this reason, textconv
1975 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1976 diff plumbing commands.
1977 </p>
1978 </dd>
1981 </dt>
1982 <dd>
1983 <p>
1986 Using "none" will consider the submodule modified when it either contains
1987 untracked or modified files or its HEAD differs from the commit recorded
1988 in the superproject and can be used to override any settings of the
1989 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1990 "untracked" is used submodules are not considered dirty when they only
1991 contain untracked content (but they are still scanned for modified
1992 content). Using "dirty" ignores all changes to the work tree of submodules,
1993 only changes to the commits stored in the superproject are shown (this was
1995 </p>
1996 </dd>
1999 </dt>
2000 <dd>
2001 <p>
2002 Show the given source prefix instead of "a/".
2003 </p>
2004 </dd>
2007 </dt>
2008 <dd>
2009 <p>
2010 Show the given destination prefix instead of "b/".
2011 </p>
2012 </dd>
2014 --no-prefix
2015 </dt>
2016 <dd>
2017 <p>
2018 Do not show any source or destination prefix.
2019 </p>
2020 </dd>
2022 --default-prefix
2023 </dt>
2024 <dd>
2025 <p>
2027 This is usually the default already, but may be used to override
2029 </p>
2030 </dd>
2033 </dt>
2034 <dd>
2035 <p>
2036 Prepend an additional prefix to every line of output.
2037 </p>
2038 </dd>
2040 --ita-invisible-in-index
2041 </dt>
2042 <dd>
2043 <p>
2044 By default entries added by "git add -N" appear as an existing
2046 This option makes the entry appear as a new file in "git diff"
2047 and non-existent in "git diff --cached". This option could be
2049 experimental and could be removed in future.
2050 </p>
2051 </dd>
2052 </dl></div>
2057 -1 --base
2058 </dt>
2060 -2 --ours
2061 </dt>
2063 -3 --theirs
2064 </dt>
2066 -0
2067 </dt>
2068 <dd>
2069 <p>
2071 branch" respectively. With these options, diffs for
2072 merged entries are not shown.
2073 </p>
2075 cleanly resolved paths. The option -0 can be given to
2077 </dd>
2079 -c
2080 </dt>
2082 --cc
2083 </dt>
2084 <dd>
2085 <p>
2087 branch) and the working tree file and outputs a combined
2089 commit with these flags.
2090 </p>
2091 </dd>
2093 -q
2094 </dt>
2095 <dd>
2096 <p>
2097 Remain silent even on nonexistent files
2098 </p>
2099 </dd>
2100 </dl></div>
2101 </div>
2102 </div>
2109 compared differs:</p></div>
2113 </dt>
2114 <dd>
2115 <p>
2117 </p>
2118 </dd>
2121 </dt>
2122 <dd>
2123 <p>
2125 </p>
2126 </dd>
2129 </dt>
2130 <dd>
2131 <p>
2132 compares the trees named by the two arguments.
2133 </p>
2134 </dd>
2137 </dt>
2138 <dd>
2139 <p>
2140 compares the index and the files on the filesystem.
2141 </p>
2142 </dd>
2143 </dl></div>
2144 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
2145 what is being compared. After that, all the commands print one output
2146 line per changed file.</p></div>
2153 create :000000 100644 0000000 1234567 A file4
2154 delete :100644 000000 1234567 0000000 D file5
2156 </div></div>
2159 <li>
2160 <p>
2161 a colon.
2162 </p>
2163 </li>
2164 <li>
2165 <p>
2167 </p>
2168 </li>
2169 <li>
2170 <p>
2171 a space.
2172 </p>
2173 </li>
2174 <li>
2175 <p>
2177 </p>
2178 </li>
2179 <li>
2180 <p>
2181 a space.
2182 </p>
2183 </li>
2184 <li>
2185 <p>
2187 </p>
2188 </li>
2189 <li>
2190 <p>
2191 a space.
2192 </p>
2193 </li>
2194 <li>
2195 <p>
2197 </p>
2198 </li>
2199 <li>
2200 <p>
2201 a space.
2202 </p>
2203 </li>
2204 <li>
2205 <p>
2206 status, followed by optional "score" number.
2207 </p>
2208 </li>
2209 <li>
2210 <p>
2212 </p>
2213 </li>
2214 <li>
2215 <p>
2216 path for "src"
2217 </p>
2218 </li>
2219 <li>
2220 <p>
2222 </p>
2223 </li>
2224 <li>
2225 <p>
2226 path for "dst"; only exists for C or R.
2227 </p>
2228 </li>
2229 <li>
2230 <p>
2232 </p>
2233 </li>
2234 </ol></div>
2237 <li>
2238 <p>
2239 A: addition of a file
2240 </p>
2241 </li>
2242 <li>
2243 <p>
2244 C: copy of a file into a new one
2245 </p>
2246 </li>
2247 <li>
2248 <p>
2249 D: deletion of a file
2250 </p>
2251 </li>
2252 <li>
2253 <p>
2254 M: modification of the contents or mode of a file
2255 </p>
2256 </li>
2257 <li>
2258 <p>
2259 R: renaming of a file
2260 </p>
2261 </li>
2262 <li>
2263 <p>
2264 T: change in the type of the file (regular file, symbolic link or submodule)
2265 </p>
2266 </li>
2267 <li>
2268 <p>
2269 U: file is unmerged (you must complete the merge before it can
2270 be committed)
2271 </p>
2272 </li>
2273 <li>
2274 <p>
2275 X: "unknown" change type (most probably a bug, please report it)
2276 </p>
2277 </li>
2278 </ul></div>
2280 percentage of similarity between the source and target of the move or
2281 copy). Status letter M may be followed by a score (denoting the
2282 percentage of dissimilarity) for file rewrites.</p></div>
2283 <div class="paragraph"><p>The sha1 for "dst" is shown as all 0’s if a file on the filesystem
2284 is out of sync with the index.</p></div>
2289 </div></div>
2290 <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2292 (see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2293 verbatim and the line is terminated by a NUL byte.</p></div>
2294 </div>
2295 </div>
2301 to generate diff output also for merge commits. The output differs
2302 from the format described above in the following way:</p></div>
2304 <li>
2305 <p>
2306 there is a colon for each parent
2307 </p>
2308 </li>
2309 <li>
2310 <p>
2312 </p>
2313 </li>
2314 <li>
2315 <p>
2316 status is concatenated status characters for each parent
2317 </p>
2318 </li>
2319 <li>
2320 <p>
2321 no optional "score" number
2322 </p>
2323 </li>
2324 <li>
2325 <p>
2326 tab-separated pathname(s) of the file
2327 </p>
2328 </li>
2329 </ol></div>
2330 <div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2331 if the file was renamed on any side of history. With
2333 followed by the name of the path in the merge commit.</p></div>
2334 <div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
2340 </div></div>
2341 <div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2347 </div></div>
2348 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2349 all parents.</p></div>
2350 </div>
2351 </div>
2363 You can customize the creation of patch text via the
2365 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
2366 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2367 diff format:</p></div>
2369 <li>
2370 <p>
2371 It is preceded with a "git diff" header that looks like this:
2372 </p>
2376 </div></div>
2377 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
2378 involved. Especially, even for a creation or a deletion,
2379 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2380 <div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
2381 name of the source file of the rename/copy and the name of
2382 the file that rename/copy produces, respectively.</p></div>
2383 </li>
2384 <li>
2385 <p>
2386 It is followed by one or more extended header lines:
2387 </p>
2401 </div></div>
2402 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2403 and file permission bits.</p></div>
2404 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
2406 the dissimilarity index is the percentage of changed lines. It
2407 is a rounded down integer, followed by a percent sign. The
2408 similarity index value of 100% is thus reserved for two equal
2409 files, while 100% dissimilarity means that no line from the old
2410 file made it into the new one.</p></div>
2411 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
2413 separate lines indicate the old and the new mode.</p></div>
2414 </li>
2415 <li>
2416 <p>
2417 Pathnames with "unusual" characters are quoted as explained for
2420 </p>
2421 </li>
2422 <li>
2423 <p>
2426 It is incorrect to apply each change to each file sequentially. For
2427 example, this patch will swap a and b:
2428 </p>
2431 <pre><code>diff --git a/a b/b
2432 rename from a
2433 rename to b
2434 diff --git a/b b/a
2435 rename from b
2436 rename to a</code></pre>
2437 </div></div>
2438 </li>
2439 <li>
2440 <p>
2441 Hunk headers mention the name of the function to which the hunk
2442 applies. See "Defining a custom hunk-header" in
2444 specific languages.
2445 </p>
2446 </li>
2447 </ol></div>
2448 </div>
2449 </div>
2453 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
2458 diffs in specific format.</p></div>
2462 <pre><code>diff --combined describe.c
2463 index fabadb8,cc95eb0..4866510
2464 --- a/describe.c
2465 +++ b/describe.c
2468 }
2470 - static void describe(char *arg)
2471 -static void describe(struct commit *cmit, int last_one)
2472 ++static void describe(char *arg, int last_one)
2473 {
2474 + unsigned char sha1[20];
2475 + struct commit *cmit;
2476 struct commit_list *list;
2477 static int initialized = 0;
2478 struct commit_name *n;
2481 + usage(describe_usage);
2482 + cmit = lookup_commit_reference(sha1);
2483 + if (!cmit)
2484 + usage(describe_usage);
2485 +
2486 if (!initialized) {
2487 initialized = 1;
2488 for_each_ref(get_name);</code></pre>
2489 </div></div>
2491 <li>
2492 <p>
2493 It is preceded with a "git diff" header, that looks like
2495 </p>
2499 </div></div>
2504 </div></div>
2505 </li>
2506 <li>
2507 <p>
2508 It is followed by one or more extended header lines
2509 (this example shows a merge with two parents):
2510 </p>
2517 </div></div>
2518 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
2520 information about detected contents movement (renames and
2521 copying detection) are designed to work with diff of two
2523 </li>
2524 <li>
2525 <p>
2526 It is followed by two-line from-file/to-file header
2527 </p>
2530 <pre><code>--- a/file
2531 +++ b/file</code></pre>
2532 </div></div>
2535 files.</p></div>
2536 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2537 two-line from-file/to-file you get a N+1 line from-file/to-file header,
2538 where N is the number of parents in the merge commit</p></div>
2541 <pre><code>--- a/file
2542 --- a/file
2543 --- a/file
2544 +++ b/file</code></pre>
2545 </div></div>
2547 active, to allow you to see the original name of the file in different
2548 parents.</p></div>
2549 </li>
2550 <li>
2551 <p>
2552 Chunk header format is modified to prevent people from
2554 was created for review of merge commit changes, and was not
2555 meant to be applied. The change is similar to the change in the
2557 </p>
2560 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
2561 </div></div>
2562 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
2563 header for combined diff format.</p></div>
2564 </li>
2565 </ol></div>
2567 files A and B with a single column that has <code>-</code> (minus — appears in A but removed in B), <code>+</code> (plus — missing in A but
2569 compares two or more files file1, file2,… with one file X, and
2570 shows how X differs from each of fileN. One column for each of
2571 fileN is prepended to the output line to note how X’s line is
2572 different from it.</p></div>
2573 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2575 in the column N means that the line appears in the result,
2576 and fileN does not have that line (in other words, the line was
2577 added, from the point of view of that parent).</p></div>
2581 in either file1 or file2). Also eight other lines are the same
2583 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
2584 merge commit with the merge result (i.e. file1..fileN are the
2586 two unresolved merge parents with the working tree file
2589 </div>
2590 </div>
2594 <div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2596 output. These options can be combined with other options, such as
2598 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
2599 formats the pathnames compactly by combining common prefix and suffix of
2605 </div></div>
2606 <div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2608 like this:</p></div>
2613 </div></div>
2616 <li>
2617 <p>
2618 the number of added lines;
2619 </p>
2620 </li>
2621 <li>
2622 <p>
2623 a tab;
2624 </p>
2625 </li>
2626 <li>
2627 <p>
2628 the number of deleted lines;
2629 </p>
2630 </li>
2631 <li>
2632 <p>
2633 a tab;
2634 </p>
2635 </li>
2636 <li>
2637 <p>
2638 pathname (possibly with rename/copy information);
2639 </p>
2640 </li>
2641 <li>
2642 <p>
2643 a newline.
2644 </p>
2645 </li>
2646 </ol></div>
2647 <div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
2652 </div></div>
2655 <li>
2656 <p>
2657 the number of added lines;
2658 </p>
2659 </li>
2660 <li>
2661 <p>
2662 a tab;
2663 </p>
2664 </li>
2665 <li>
2666 <p>
2667 the number of deleted lines;
2668 </p>
2669 </li>
2670 <li>
2671 <p>
2672 a tab;
2673 </p>
2674 </li>
2675 <li>
2676 <p>
2677 a NUL (only exists if renamed/copied);
2678 </p>
2679 </li>
2680 <li>
2681 <p>
2682 pathname in preimage;
2683 </p>
2684 </li>
2685 <li>
2686 <p>
2687 a NUL (only exists if renamed/copied);
2688 </p>
2689 </li>
2690 <li>
2691 <p>
2692 pathname in postimage (only exists if renamed/copied);
2693 </p>
2694 </li>
2695 <li>
2696 <p>
2697 a NUL.
2698 </p>
2699 </li>
2700 </ol></div>
2701 <div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
2702 scripts that read the output to tell if the current record being read is
2703 a single-path record or a rename/copy record without reading ahead.
2706 </div>
2707 </div>
2712 </div>
2713 </div>
2714 </div>
2718 Last updated
2720 </div>
2721 </div>
2722 </body>
2723 </html>