| blob | b4de7d6faeb9c7759ea3416de022e57c9f71fa01 |
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>
782 </p>
783 </dd>
785 -s
786 </dt>
788 --no-patch
789 </dt>
790 <dd>
791 <p>
792 Suppress all output from the diff machinery. Useful for
794 squelch their output, or to cancel the effect of options like
796 </p>
797 </dd>
800 </dt>
803 </dt>
804 <dd>
805 <p>
807 the usual three.
809 </p>
810 </dd>
813 </dt>
814 <dd>
815 <p>
816 Output to a specific file instead of stdout.
817 </p>
818 </dd>
821 </dt>
824 </dt>
827 </dt>
828 <dd>
829 <p>
830 Specify the character used to indicate new, old or context
832 ' ' respectively.
833 </p>
834 </dd>
836 --raw
837 </dt>
838 <dd>
839 <p>
840 Generate the diff in raw format.
841 This is the default.
842 </p>
843 </dd>
845 --patch-with-raw
846 </dt>
847 <dd>
848 <p>
850 </p>
851 </dd>
853 --indent-heuristic
854 </dt>
855 <dd>
856 <p>
857 Enable the heuristic that shifts diff hunk boundaries to make patches
858 easier to read. This is the default.
859 </p>
860 </dd>
862 --no-indent-heuristic
863 </dt>
864 <dd>
865 <p>
866 Disable the indent heuristic.
867 </p>
868 </dd>
870 --minimal
871 </dt>
872 <dd>
873 <p>
874 Spend extra time to make sure the smallest possible
875 diff is produced.
876 </p>
877 </dd>
879 --patience
880 </dt>
881 <dd>
882 <p>
883 Generate a diff using the "patience diff" algorithm.
884 </p>
885 </dd>
887 --histogram
888 </dt>
889 <dd>
890 <p>
891 Generate a diff using the "histogram diff" algorithm.
892 </p>
893 </dd>
896 </dt>
897 <dd>
898 <p>
899 Generate a diff using the "anchored diff" algorithm.
900 </p>
902 <div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
903 and starts with this text, this algorithm attempts to prevent it from
904 appearing as a deletion or addition in the output. It uses the "patience
906 </dd>
908 --diff-algorithm={patience|minimal|histogram|myers}
909 </dt>
910 <dd>
911 <p>
912 Choose a diff algorithm. The variants are as follows:
913 </p>
919 </dt>
920 <dd>
921 <p>
922 The basic greedy diff algorithm. Currently, this is the default.
923 </p>
924 </dd>
927 </dt>
928 <dd>
929 <p>
930 Spend extra time to make sure the smallest possible diff is
931 produced.
932 </p>
933 </dd>
936 </dt>
937 <dd>
938 <p>
939 Use "patience diff" algorithm when generating patches.
940 </p>
941 </dd>
944 </dt>
945 <dd>
946 <p>
947 This algorithm extends the patience algorithm to "support
948 low-occurrence common elements".
949 </p>
950 </dd>
951 </dl></div>
952 </div></div>
953 <div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
954 non-default value and want to use the default one, then you
956 </dd>
959 </dt>
960 <dd>
961 <p>
962 Generate a diffstat. By default, as much space as necessary
963 will be used for the filename part, and the rest for the graph
964 part. Maximum width defaults to terminal width, or 80 columns
965 if not connected to a terminal, and can be overridden by
968 of the graph part can be limited by using
974 there are more.
975 </p>
976 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
977 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
978 </dd>
980 --compact-summary
981 </dt>
982 <dd>
983 <p>
984 Output a condensed summary of extended header information such
987 or removing executable bit respectively) in diffstat. The
988 information is put between the filename part and the graph
990 </p>
991 </dd>
993 --numstat
994 </dt>
995 <dd>
996 <p>
998 deleted lines in decimal notation and pathname without
999 abbreviation, to make it more machine friendly. For
1002 </p>
1003 </dd>
1005 --shortstat
1006 </dt>
1007 <dd>
1008 <p>
1010 number of modified files, as well as number of added and deleted
1011 lines.
1012 </p>
1013 </dd>
1016 </dt>
1019 </dt>
1020 <dd>
1021 <p>
1022 Output the distribution of relative amount of changes for each
1024 passing it a comma separated list of parameters.
1027 The following parameters are available:
1028 </p>
1034 </dt>
1035 <dd>
1036 <p>
1037 Compute the dirstat numbers by counting the lines that have been
1038 removed from the source, or added to the destination. This ignores
1039 the amount of pure code movements within a file. In other words,
1040 rearranging lines in a file is not counted as much as other changes.
1041 This is the default behavior when no parameter is given.
1042 </p>
1043 </dd>
1046 </dt>
1047 <dd>
1048 <p>
1049 Compute the dirstat numbers by doing the regular line-based diff
1050 analysis, and summing the removed/added line counts. (For binary
1051 files, count 64-byte chunks instead, since binary files have no
1054 lines within a file as much as other changes. The resulting output
1056 </p>
1057 </dd>
1060 </dt>
1061 <dd>
1062 <p>
1063 Compute the dirstat numbers by counting the number of files changed.
1064 Each changed file counts equally in the dirstat analysis. This is
1066 not have to look at the file contents at all.
1067 </p>
1068 </dd>
1071 </dt>
1072 <dd>
1073 <p>
1074 Count changes in a child directory for the parent directory as well.
1076 reported may exceed 100%. The default (non-cumulative) behavior can
1078 </p>
1079 </dd>
1082 </dt>
1083 <dd>
1084 <p>
1085 An integer parameter specifies a cut-off percent (3% by default).
1086 Directories contributing less than this percentage of the changes
1087 are not shown in the output.
1088 </p>
1089 </dd>
1090 </dl></div>
1091 </div></div>
1093 directories with less than 10% of the total amount of changed files,
1094 and accumulating child directory counts in the parent directories:
1096 </dd>
1098 --cumulative
1099 </dt>
1100 <dd>
1101 <p>
1102 Synonym for --dirstat=cumulative
1103 </p>
1104 </dd>
1107 </dt>
1108 <dd>
1109 <p>
1110 Synonym for --dirstat=files,param1,param2…
1111 </p>
1112 </dd>
1114 --summary
1115 </dt>
1116 <dd>
1117 <p>
1118 Output a condensed summary of extended header information
1119 such as creations, renames and mode changes.
1120 </p>
1121 </dd>
1123 --patch-with-stat
1124 </dt>
1125 <dd>
1126 <p>
1128 </p>
1129 </dd>
1131 -z
1132 </dt>
1133 <dd>
1134 <p>
1135 When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
1136 given, do not munge pathnames and use NULs as output field terminators.
1137 </p>
1138 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1141 </dd>
1143 --name-only
1144 </dt>
1145 <dd>
1146 <p>
1147 Show only names of changed files. The file names are often encoded in UTF-8.
1148 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1149 manual page.
1150 </p>
1151 </dd>
1153 --name-status
1154 </dt>
1155 <dd>
1156 <p>
1157 Show only names and status of changed files. See the description
1160 </p>
1161 </dd>
1164 </dt>
1165 <dd>
1166 <p>
1167 Specify how differences in submodules are shown. When specifying
1169 shows the names of the commits at the beginning and end of the range.
1171 format is used. This format lists the commits in the range like
1172 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1174 inline diff of the changes in the submodule contents between the
1176 if the config option is unset.
1177 </p>
1178 </dd>
1181 </dt>
1182 <dd>
1183 <p>
1184 Show colored diff.
1185 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
1186 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
1187 </p>
1188 </dd>
1190 --no-color
1191 </dt>
1192 <dd>
1193 <p>
1194 Turn off colored diff.
1196 </p>
1197 </dd>
1200 </dt>
1201 <dd>
1202 <p>
1203 Moved lines of code are colored differently.
1206 The mode must be one of:
1207 </p>
1212 no
1213 </dt>
1214 <dd>
1215 <p>
1216 Moved lines are not highlighted.
1217 </p>
1218 </dd>
1220 default
1221 </dt>
1222 <dd>
1223 <p>
1225 in the future.
1226 </p>
1227 </dd>
1229 plain
1230 </dt>
1231 <dd>
1232 <p>
1233 Any line that is added in one location and was removed
1236 that are added somewhere else in the diff. This mode picks up any
1237 moved line, but it is not very useful in a review to determine
1238 if a block of code was moved without permutation.
1239 </p>
1240 </dd>
1242 blocks
1243 </dt>
1244 <dd>
1245 <p>
1246 Blocks of moved text of at least 20 alphanumeric characters
1247 are detected greedily. The detected blocks are
1249 Adjacent blocks cannot be told apart.
1250 </p>
1251 </dd>
1253 zebra
1254 </dt>
1255 <dd>
1256 <p>
1260 the two colors indicates that a new block was detected.
1261 </p>
1262 </dd>
1264 dimmed-zebra
1265 </dt>
1266 <dd>
1267 <p>
1269 of moved code is performed. The bordering lines of two adjacent
1270 blocks are considered interesting, the rest is uninteresting.
1272 </p>
1273 </dd>
1274 </dl></div>
1275 </div></div>
1276 </dd>
1278 --no-color-moved
1279 </dt>
1280 <dd>
1281 <p>
1282 Turn off move detection. This can be used to override configuration
1284 </p>
1285 </dd>
1288 </dt>
1289 <dd>
1290 <p>
1291 This configures how whitespace is ignored when performing the
1293 These modes can be given as a comma separated list:
1294 </p>
1299 no
1300 </dt>
1301 <dd>
1302 <p>
1303 Do not ignore whitespace when performing move detection.
1304 </p>
1305 </dd>
1307 ignore-space-at-eol
1308 </dt>
1309 <dd>
1310 <p>
1311 Ignore changes in whitespace at EOL.
1312 </p>
1313 </dd>
1315 ignore-space-change
1316 </dt>
1317 <dd>
1318 <p>
1319 Ignore changes in amount of whitespace. This ignores whitespace
1320 at line end, and considers all other sequences of one or
1321 more whitespace characters to be equivalent.
1322 </p>
1323 </dd>
1325 ignore-all-space
1326 </dt>
1327 <dd>
1328 <p>
1329 Ignore whitespace when comparing lines. This ignores differences
1330 even if one line has whitespace where the other line has none.
1331 </p>
1332 </dd>
1334 allow-indentation-change
1335 </dt>
1336 <dd>
1337 <p>
1338 Initially ignore any whitespace in the move detection, then
1339 group the moved code blocks only into a block if the change in
1340 whitespace is the same per line. This is incompatible with the
1341 other modes.
1342 </p>
1343 </dd>
1344 </dl></div>
1345 </div></div>
1346 </dd>
1348 --no-color-moved-ws
1349 </dt>
1350 <dd>
1351 <p>
1352 Do not ignore whitespace when performing move detection. This can be
1353 used to override configuration settings. It is the same as
1355 </p>
1356 </dd>
1359 </dt>
1360 <dd>
1361 <p>
1363 By default, words are delimited by whitespace; see
1365 must be one of:
1366 </p>
1371 color
1372 </dt>
1373 <dd>
1374 <p>
1376 </p>
1377 </dd>
1379 plain
1380 </dt>
1381 <dd>
1382 <p>
1384 attempts to escape the delimiters if they appear in the input,
1385 so the output may be ambiguous.
1386 </p>
1387 </dd>
1389 porcelain
1390 </dt>
1391 <dd>
1392 <p>
1393 Use a special line-based format intended for script
1394 consumption. Added/removed/unchanged runs are printed in the
1396 character at the beginning of the line and extending to the
1397 end of the line. Newlines in the input are represented by a
1399 </p>
1400 </dd>
1402 none
1403 </dt>
1404 <dd>
1405 <p>
1406 Disable word diff again.
1407 </p>
1408 </dd>
1409 </dl></div>
1410 </div></div>
1412 highlight the changed parts in all modes if enabled.</p></div>
1413 </dd>
1416 </dt>
1417 <dd>
1418 <p>
1420 runs of non-whitespace to be a word. Also implies
1422 </p>
1425 considered whitespace and ignored(!) for the purposes of finding
1427 expression to make sure that it matches all non-whitespace characters.
1428 A match that contains a newline is silently truncated(!) at the
1429 newline.</p></div>
1430 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1431 and, correspondingly, show differences character by character.</p></div>
1432 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1433 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
1434 overrides any diff driver or configuration setting. Diff drivers
1435 override configuration settings.</p></div>
1436 </dd>
1439 </dt>
1440 <dd>
1441 <p>
1444 </p>
1445 </dd>
1447 --no-renames
1448 </dt>
1449 <dd>
1450 <p>
1451 Turn off rename detection, even when the configuration
1452 file gives the default to do so.
1453 </p>
1454 </dd>
1456 --[no-]rename-empty
1457 </dt>
1458 <dd>
1459 <p>
1460 Whether to use empty blobs as rename source.
1461 </p>
1462 </dd>
1464 --check
1465 </dt>
1466 <dd>
1467 <p>
1468 Warn if changes introduce conflict markers or whitespace errors.
1470 configuration. By default, trailing whitespaces (including
1471 lines that consist solely of whitespaces) and a space character
1472 that is immediately followed by a tab character inside the
1473 initial indent of the line are considered whitespace errors.
1474 Exits with non-zero status if problems are found. Not compatible
1475 with --exit-code.
1476 </p>
1477 </dd>
1480 </dt>
1481 <dd>
1482 <p>
1484 lines of the diff. Multiple values are separated by comma,
1487 this option is not given, and the configuration variable
1491 </p>
1492 </dd>
1494 --full-index
1495 </dt>
1496 <dd>
1497 <p>
1498 Instead of the first handful of characters, show the full
1499 pre- and post-image blob object names on the "index"
1500 line when generating patch format output.
1501 </p>
1502 </dd>
1504 --binary
1505 </dt>
1506 <dd>
1507 <p>
1511 </p>
1512 </dd>
1515 </dt>
1516 <dd>
1517 <p>
1518 Instead of showing the full 40-byte hexadecimal object
1519 name in diff-raw format output and diff-tree header
1521 hexdigits long that uniquely refers the object.
1526 </p>
1527 </dd>
1530 </dt>
1533 </dt>
1534 <dd>
1535 <p>
1536 Break complete rewrite changes into pairs of delete and
1537 create. This serves two purposes:
1538 </p>
1539 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1540 not as a series of deletion and insertion mixed together with a very
1541 few lines that happen to match textually as the context, but as a
1542 single deletion of everything old followed by a single insertion of
1545 original should remain in the result for Git to consider it a total
1546 rewrite (i.e. otherwise the resulting patch will be a series of
1547 deletion and insertion mixed together with context lines).</p></div>
1548 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1549 source of a rename (usually -M only considers a file that disappeared
1553 eligible for being picked up as a possible source of a rename to
1554 another file.</p></div>
1555 </dd>
1558 </dt>
1561 </dt>
1562 <dd>
1563 <p>
1564 Detect renames.
1566 index (i.e. amount of addition/deletions compared to the
1568 delete/add pair to be a rename if more than 90% of the file
1574 </p>
1575 </dd>
1578 </dt>
1581 </dt>
1582 <dd>
1583 <p>
1586 </p>
1587 </dd>
1589 --find-copies-harder
1590 </dt>
1591 <dd>
1592 <p>
1594 if the original file of the copy was modified in the same
1595 changeset. This flag makes the command
1596 inspect unmodified files as candidates for the source of
1597 copy. This is a very expensive operation for large
1598 projects, so use it with caution. Giving more than one
1600 </p>
1601 </dd>
1603 -D
1604 </dt>
1606 --irreversible-delete
1607 </dt>
1608 <dd>
1609 <p>
1610 Omit the preimage for deletes, i.e. print only the header but not
1613 solely for people who want to just concentrate on reviewing the
1614 text after the change. In addition, the output obviously lacks
1615 enough information to apply such a patch in reverse, even manually,
1616 hence the name of the option.
1617 </p>
1618 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1619 of a delete/create pair.</p></div>
1620 </dd>
1623 </dt>
1624 <dd>
1625 <p>
1627 can detect subsets of renames/copies cheaply, followed by an
1628 exhaustive fallback portion that compares all remaining
1629 unpaired destinations to all relevant sources. (For renames,
1630 only remaining unpaired sources are relevant; for copies, all
1631 original sources are relevant.) For N sources and
1632 destinations, this exhaustive check is O(N^2). This option
1633 prevents the exhaustive portion of rename/copy detection from
1634 running if the number of source/destination files involved
1635 exceeds the specified number. Defaults to diff.renameLimit.
1636 Note that a value of 0 is treated as unlimited.
1637 </p>
1638 </dd>
1640 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1641 </dt>
1642 <dd>
1643 <p>
1649 Any combination of the filter characters (including none) can be used.
1651 paths are selected if there is any file that matches
1652 other criteria in the comparison; if there is no file
1653 that matches other criteria, nothing is selected.
1654 </p>
1657 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1658 renamed entries cannot appear if detection for those types is disabled.</p></div>
1659 </dd>
1662 </dt>
1663 <dd>
1664 <p>
1665 Look for differences that change the number of occurrences of
1666 the specified string (i.e. addition/deletion) in a file.
1667 Intended for the scripter’s use.
1668 </p>
1669 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
1670 struct), and want to know the history of that block since it first
1671 came into being: use the feature iteratively to feed the interesting
1673 very first version of the block.</p></div>
1675 </dd>
1678 </dt>
1679 <dd>
1680 <p>
1681 Look for differences whose patch text contains added/removed
1683 </p>
1684 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
1686 file:</p></div>
1690 ...
1692 </div></div>
1693 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1695 occurrences of that string did not change).</p></div>
1696 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1697 filter will be ignored.</p></div>
1698 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1699 information.</p></div>
1700 </dd>
1703 </dt>
1704 <dd>
1705 <p>
1706 Look for differences that change the number of occurrences of
1708 in that it doesn’t search for a specific string but for a specific
1709 object id.
1710 </p>
1711 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1713 </dd>
1715 --pickaxe-all
1716 </dt>
1717 <dd>
1718 <p>
1720 changeset, not just the files that contain the change
1722 </p>
1723 </dd>
1725 --pickaxe-regex
1726 </dt>
1727 <dd>
1728 <p>
1730 expression to match.
1731 </p>
1732 </dd>
1735 </dt>
1736 <dd>
1737 <p>
1738 Control the order in which files appear in the output.
1742 </p>
1745 All files with pathnames that match the first pattern are output
1746 first, all files with pathnames that match the second pattern (but not
1747 the first) are output next, and so on.
1748 All files with pathnames that do not match any pattern are output
1749 last, as if there was an implicit match-all pattern at the end of the
1750 file.
1751 If multiple pathnames have the same rank (they match the same pattern
1752 but no earlier patterns), their output order relative to each other is
1753 the normal order.</p></div>
1758 <li>
1759 <p>
1760 Blank lines are ignored, so they can be used as separators for
1761 readability.
1762 </p>
1763 </li>
1764 <li>
1765 <p>
1766 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1767 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1768 pattern if it starts with a hash.
1769 </p>
1770 </li>
1771 <li>
1772 <p>
1773 Each other line contains a single pattern.
1774 </p>
1775 </li>
1776 </ul></div>
1777 </div></div>
1779 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1780 matches a pattern if removing any number of the final pathname
1781 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1782 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
1783 </dd>
1786 </dt>
1789 </dt>
1790 <dd>
1791 <p>
1796 otherwise.
1797 </p>
1798 </dd>
1800 -R
1801 </dt>
1802 <dd>
1803 <p>
1804 Swap two inputs; that is, show differences from index or
1805 on-disk file to tree contents.
1806 </p>
1807 </dd>
1810 </dt>
1812 --no-relative
1813 </dt>
1814 <dd>
1815 <p>
1816 When run from a subdirectory of the project, it can be
1817 told to exclude changes outside the directory and show
1818 pathnames relative to it with this option. When you are
1819 not in a subdirectory (e.g. in a bare repository), you
1820 can name which subdirectory to make the output relative
1824 </p>
1825 </dd>
1827 -a
1828 </dt>
1830 --text
1831 </dt>
1832 <dd>
1833 <p>
1834 Treat all files as text.
1835 </p>
1836 </dd>
1838 --ignore-cr-at-eol
1839 </dt>
1840 <dd>
1841 <p>
1842 Ignore carriage-return at the end of line when doing a comparison.
1843 </p>
1844 </dd>
1846 --ignore-space-at-eol
1847 </dt>
1848 <dd>
1849 <p>
1850 Ignore changes in whitespace at EOL.
1851 </p>
1852 </dd>
1854 -b
1855 </dt>
1857 --ignore-space-change
1858 </dt>
1859 <dd>
1860 <p>
1861 Ignore changes in amount of whitespace. This ignores whitespace
1862 at line end, and considers all other sequences of one or
1863 more whitespace characters to be equivalent.
1864 </p>
1865 </dd>
1867 -w
1868 </dt>
1870 --ignore-all-space
1871 </dt>
1872 <dd>
1873 <p>
1874 Ignore whitespace when comparing lines. This ignores
1875 differences even if one line has whitespace where the other
1876 line has none.
1877 </p>
1878 </dd>
1880 --ignore-blank-lines
1881 </dt>
1882 <dd>
1883 <p>
1884 Ignore changes whose lines are all blank.
1885 </p>
1886 </dd>
1889 </dt>
1892 </dt>
1893 <dd>
1894 <p>
1896 be specified more than once.
1897 </p>
1898 </dd>
1901 </dt>
1902 <dd>
1903 <p>
1904 Show the context between diff hunks, up to the specified number
1905 of lines, thereby fusing hunks that are close to each other.
1907 is unset.
1908 </p>
1909 </dd>
1911 -W
1912 </dt>
1914 --function-context
1915 </dt>
1916 <dd>
1917 <p>
1918 Show whole function as context lines for each change.
1919 The function names are determined in the same way as
1922 </p>
1923 </dd>
1925 --exit-code
1926 </dt>
1927 <dd>
1928 <p>
1929 Make the program exit with codes similar to diff(1).
1930 That is, it exits with 1 if there were differences and
1931 0 means no differences.
1932 </p>
1933 </dd>
1935 --quiet
1936 </dt>
1937 <dd>
1938 <p>
1940 </p>
1941 </dd>
1943 --ext-diff
1944 </dt>
1945 <dd>
1946 <p>
1947 Allow an external diff helper to be executed. If you set an
1950 </p>
1951 </dd>
1953 --no-ext-diff
1954 </dt>
1955 <dd>
1956 <p>
1957 Disallow external diff drivers.
1958 </p>
1959 </dd>
1961 --textconv
1962 </dt>
1964 --no-textconv
1965 </dt>
1966 <dd>
1967 <p>
1968 Allow (or disallow) external text conversion filters to be run
1970 details. Because textconv filters are typically a one-way
1971 conversion, the resulting diff is suitable for human
1972 consumption, but cannot be applied. For this reason, textconv
1974 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1975 diff plumbing commands.
1976 </p>
1977 </dd>
1980 </dt>
1981 <dd>
1982 <p>
1985 Using "none" will consider the submodule modified when it either contains
1986 untracked or modified files or its HEAD differs from the commit recorded
1987 in the superproject and can be used to override any settings of the
1988 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1989 "untracked" is used submodules are not considered dirty when they only
1990 contain untracked content (but they are still scanned for modified
1991 content). Using "dirty" ignores all changes to the work tree of submodules,
1992 only changes to the commits stored in the superproject are shown (this was
1994 </p>
1995 </dd>
1998 </dt>
1999 <dd>
2000 <p>
2001 Show the given source prefix instead of "a/".
2002 </p>
2003 </dd>
2006 </dt>
2007 <dd>
2008 <p>
2009 Show the given destination prefix instead of "b/".
2010 </p>
2011 </dd>
2013 --no-prefix
2014 </dt>
2015 <dd>
2016 <p>
2017 Do not show any source or destination prefix.
2018 </p>
2019 </dd>
2021 --default-prefix
2022 </dt>
2023 <dd>
2024 <p>
2026 This is usually the default already, but may be used to override
2028 </p>
2029 </dd>
2032 </dt>
2033 <dd>
2034 <p>
2035 Prepend an additional prefix to every line of output.
2036 </p>
2037 </dd>
2039 --ita-invisible-in-index
2040 </dt>
2041 <dd>
2042 <p>
2043 By default entries added by "git add -N" appear as an existing
2045 This option makes the entry appear as a new file in "git diff"
2046 and non-existent in "git diff --cached". This option could be
2048 experimental and could be removed in future.
2049 </p>
2050 </dd>
2051 </dl></div>
2056 -1 --base
2057 </dt>
2059 -2 --ours
2060 </dt>
2062 -3 --theirs
2063 </dt>
2065 -0
2066 </dt>
2067 <dd>
2068 <p>
2070 branch" respectively. With these options, diffs for
2071 merged entries are not shown.
2072 </p>
2074 cleanly resolved paths. The option -0 can be given to
2076 </dd>
2078 -c
2079 </dt>
2081 --cc
2082 </dt>
2083 <dd>
2084 <p>
2086 branch) and the working tree file and outputs a combined
2088 commit with these flags.
2089 </p>
2090 </dd>
2092 -q
2093 </dt>
2094 <dd>
2095 <p>
2096 Remain silent even on nonexistent files
2097 </p>
2098 </dd>
2099 </dl></div>
2100 </div>
2101 </div>
2108 compared differs:</p></div>
2112 </dt>
2113 <dd>
2114 <p>
2116 </p>
2117 </dd>
2120 </dt>
2121 <dd>
2122 <p>
2124 </p>
2125 </dd>
2128 </dt>
2129 <dd>
2130 <p>
2131 compares the trees named by the two arguments.
2132 </p>
2133 </dd>
2136 </dt>
2137 <dd>
2138 <p>
2139 compares the index and the files on the filesystem.
2140 </p>
2141 </dd>
2142 </dl></div>
2143 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
2144 what is being compared. After that, all the commands print one output
2145 line per changed file.</p></div>
2152 create :000000 100644 0000000 1234567 A file4
2153 delete :100644 000000 1234567 0000000 D file5
2155 </div></div>
2158 <li>
2159 <p>
2160 a colon.
2161 </p>
2162 </li>
2163 <li>
2164 <p>
2166 </p>
2167 </li>
2168 <li>
2169 <p>
2170 a space.
2171 </p>
2172 </li>
2173 <li>
2174 <p>
2176 </p>
2177 </li>
2178 <li>
2179 <p>
2180 a space.
2181 </p>
2182 </li>
2183 <li>
2184 <p>
2186 </p>
2187 </li>
2188 <li>
2189 <p>
2190 a space.
2191 </p>
2192 </li>
2193 <li>
2194 <p>
2196 </p>
2197 </li>
2198 <li>
2199 <p>
2200 a space.
2201 </p>
2202 </li>
2203 <li>
2204 <p>
2205 status, followed by optional "score" number.
2206 </p>
2207 </li>
2208 <li>
2209 <p>
2211 </p>
2212 </li>
2213 <li>
2214 <p>
2215 path for "src"
2216 </p>
2217 </li>
2218 <li>
2219 <p>
2221 </p>
2222 </li>
2223 <li>
2224 <p>
2225 path for "dst"; only exists for C or R.
2226 </p>
2227 </li>
2228 <li>
2229 <p>
2231 </p>
2232 </li>
2233 </ol></div>
2236 <li>
2237 <p>
2238 A: addition of a file
2239 </p>
2240 </li>
2241 <li>
2242 <p>
2243 C: copy of a file into a new one
2244 </p>
2245 </li>
2246 <li>
2247 <p>
2248 D: deletion of a file
2249 </p>
2250 </li>
2251 <li>
2252 <p>
2253 M: modification of the contents or mode of a file
2254 </p>
2255 </li>
2256 <li>
2257 <p>
2258 R: renaming of a file
2259 </p>
2260 </li>
2261 <li>
2262 <p>
2263 T: change in the type of the file (regular file, symbolic link or submodule)
2264 </p>
2265 </li>
2266 <li>
2267 <p>
2268 U: file is unmerged (you must complete the merge before it can
2269 be committed)
2270 </p>
2271 </li>
2272 <li>
2273 <p>
2274 X: "unknown" change type (most probably a bug, please report it)
2275 </p>
2276 </li>
2277 </ul></div>
2279 percentage of similarity between the source and target of the move or
2280 copy). Status letter M may be followed by a score (denoting the
2281 percentage of dissimilarity) for file rewrites.</p></div>
2282 <div class="paragraph"><p>The sha1 for "dst" is shown as all 0’s if a file on the filesystem
2283 is out of sync with the index.</p></div>
2288 </div></div>
2289 <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2291 (see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2292 verbatim and the line is terminated by a NUL byte.</p></div>
2293 </div>
2294 </div>
2300 to generate diff output also for merge commits. The output differs
2301 from the format described above in the following way:</p></div>
2303 <li>
2304 <p>
2305 there is a colon for each parent
2306 </p>
2307 </li>
2308 <li>
2309 <p>
2311 </p>
2312 </li>
2313 <li>
2314 <p>
2315 status is concatenated status characters for each parent
2316 </p>
2317 </li>
2318 <li>
2319 <p>
2320 no optional "score" number
2321 </p>
2322 </li>
2323 <li>
2324 <p>
2325 tab-separated pathname(s) of the file
2326 </p>
2327 </li>
2328 </ol></div>
2329 <div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2330 if the file was renamed on any side of history. With
2332 followed by the name of the path in the merge commit.</p></div>
2333 <div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
2339 </div></div>
2340 <div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2346 </div></div>
2347 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2348 all parents.</p></div>
2349 </div>
2350 </div>
2362 You can customize the creation of patch text via the
2364 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
2365 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2366 diff format:</p></div>
2368 <li>
2369 <p>
2370 It is preceded with a "git diff" header that looks like this:
2371 </p>
2375 </div></div>
2376 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
2377 involved. Especially, even for a creation or a deletion,
2378 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2379 <div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
2380 name of the source file of the rename/copy and the name of
2381 the file that rename/copy produces, respectively.</p></div>
2382 </li>
2383 <li>
2384 <p>
2385 It is followed by one or more extended header lines:
2386 </p>
2400 </div></div>
2401 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2402 and file permission bits.</p></div>
2403 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
2405 the dissimilarity index is the percentage of changed lines. It
2406 is a rounded down integer, followed by a percent sign. The
2407 similarity index value of 100% is thus reserved for two equal
2408 files, while 100% dissimilarity means that no line from the old
2409 file made it into the new one.</p></div>
2410 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
2412 separate lines indicate the old and the new mode.</p></div>
2413 </li>
2414 <li>
2415 <p>
2416 Pathnames with "unusual" characters are quoted as explained for
2419 </p>
2420 </li>
2421 <li>
2422 <p>
2425 It is incorrect to apply each change to each file sequentially. For
2426 example, this patch will swap a and b:
2427 </p>
2430 <pre><code>diff --git a/a b/b
2431 rename from a
2432 rename to b
2433 diff --git a/b b/a
2434 rename from b
2435 rename to a</code></pre>
2436 </div></div>
2437 </li>
2438 <li>
2439 <p>
2440 Hunk headers mention the name of the function to which the hunk
2441 applies. See "Defining a custom hunk-header" in
2443 specific languages.
2444 </p>
2445 </li>
2446 </ol></div>
2447 </div>
2448 </div>
2452 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
2457 diffs in specific format.</p></div>
2461 <pre><code>diff --combined describe.c
2462 index fabadb8,cc95eb0..4866510
2463 --- a/describe.c
2464 +++ b/describe.c
2467 }
2469 - static void describe(char *arg)
2470 -static void describe(struct commit *cmit, int last_one)
2471 ++static void describe(char *arg, int last_one)
2472 {
2473 + unsigned char sha1[20];
2474 + struct commit *cmit;
2475 struct commit_list *list;
2476 static int initialized = 0;
2477 struct commit_name *n;
2480 + usage(describe_usage);
2481 + cmit = lookup_commit_reference(sha1);
2482 + if (!cmit)
2483 + usage(describe_usage);
2484 +
2485 if (!initialized) {
2486 initialized = 1;
2487 for_each_ref(get_name);</code></pre>
2488 </div></div>
2490 <li>
2491 <p>
2492 It is preceded with a "git diff" header, that looks like
2494 </p>
2498 </div></div>
2503 </div></div>
2504 </li>
2505 <li>
2506 <p>
2507 It is followed by one or more extended header lines
2508 (this example shows a merge with two parents):
2509 </p>
2516 </div></div>
2517 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
2519 information about detected contents movement (renames and
2520 copying detection) are designed to work with diff of two
2522 </li>
2523 <li>
2524 <p>
2525 It is followed by two-line from-file/to-file header
2526 </p>
2529 <pre><code>--- a/file
2530 +++ b/file</code></pre>
2531 </div></div>
2534 files.</p></div>
2535 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2536 two-line from-file/to-file you get a N+1 line from-file/to-file header,
2537 where N is the number of parents in the merge commit</p></div>
2540 <pre><code>--- a/file
2541 --- a/file
2542 --- a/file
2543 +++ b/file</code></pre>
2544 </div></div>
2546 active, to allow you to see the original name of the file in different
2547 parents.</p></div>
2548 </li>
2549 <li>
2550 <p>
2551 Chunk header format is modified to prevent people from
2553 was created for review of merge commit changes, and was not
2554 meant to be applied. The change is similar to the change in the
2556 </p>
2559 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
2560 </div></div>
2561 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
2562 header for combined diff format.</p></div>
2563 </li>
2564 </ol></div>
2566 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
2568 compares two or more files file1, file2,… with one file X, and
2569 shows how X differs from each of fileN. One column for each of
2570 fileN is prepended to the output line to note how X’s line is
2571 different from it.</p></div>
2572 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2574 in the column N means that the line appears in the result,
2575 and fileN does not have that line (in other words, the line was
2576 added, from the point of view of that parent).</p></div>
2580 in either file1 or file2). Also eight other lines are the same
2582 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
2583 merge commit with the merge result (i.e. file1..fileN are the
2585 two unresolved merge parents with the working tree file
2588 </div>
2589 </div>
2593 <div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2595 output. These options can be combined with other options, such as
2597 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
2598 formats the pathnames compactly by combining common prefix and suffix of
2604 </div></div>
2605 <div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2607 like this:</p></div>
2612 </div></div>
2615 <li>
2616 <p>
2617 the number of added lines;
2618 </p>
2619 </li>
2620 <li>
2621 <p>
2622 a tab;
2623 </p>
2624 </li>
2625 <li>
2626 <p>
2627 the number of deleted lines;
2628 </p>
2629 </li>
2630 <li>
2631 <p>
2632 a tab;
2633 </p>
2634 </li>
2635 <li>
2636 <p>
2637 pathname (possibly with rename/copy information);
2638 </p>
2639 </li>
2640 <li>
2641 <p>
2642 a newline.
2643 </p>
2644 </li>
2645 </ol></div>
2646 <div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
2651 </div></div>
2654 <li>
2655 <p>
2656 the number of added lines;
2657 </p>
2658 </li>
2659 <li>
2660 <p>
2661 a tab;
2662 </p>
2663 </li>
2664 <li>
2665 <p>
2666 the number of deleted lines;
2667 </p>
2668 </li>
2669 <li>
2670 <p>
2671 a tab;
2672 </p>
2673 </li>
2674 <li>
2675 <p>
2676 a NUL (only exists if renamed/copied);
2677 </p>
2678 </li>
2679 <li>
2680 <p>
2681 pathname in preimage;
2682 </p>
2683 </li>
2684 <li>
2685 <p>
2686 a NUL (only exists if renamed/copied);
2687 </p>
2688 </li>
2689 <li>
2690 <p>
2691 pathname in postimage (only exists if renamed/copied);
2692 </p>
2693 </li>
2694 <li>
2695 <p>
2696 a NUL.
2697 </p>
2698 </li>
2699 </ol></div>
2700 <div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
2701 scripts that read the output to tell if the current record being read is
2702 a single-path record or a rename/copy record without reading ahead.
2705 </div>
2706 </div>
2711 </div>
2712 </div>
2713 </div>
2717 Last updated
2719 </div>
2720 </div>
2721 </body>
2722 </html>