| blob | befc273171c2ec65e5f0306a349d60c929ce2dfc |
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-index(1) Manual Page
739 </h1>
742 <p>git-diff-index -
743 Compare a tree to the working tree or index
744 </p>
745 </div>
746 </div>
752 <pre class="content"><em>git diff-index</em> [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>…]</pre>
754 </div></div>
755 </div>
756 </div>
761 with the corresponding tracked files in the working tree, or with the
763 compare only paths matching those patterns. Otherwise all tracked
764 files are compared.</p></div>
765 </div>
766 </div>
772 -p
773 </dt>
775 -u
776 </dt>
778 --patch
779 </dt>
780 <dd>
781 <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
977 </p>
978 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
979 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
980 </dd>
982 --compact-summary
983 </dt>
984 <dd>
985 <p>
986 Output a condensed summary of extended header information such
989 or removing executable bit respectively) in diffstat. The
990 information is put between the filename part and the graph
992 </p>
993 </dd>
995 --numstat
996 </dt>
997 <dd>
998 <p>
1000 deleted lines in decimal notation and pathname without
1001 abbreviation, to make it more machine friendly. For
1004 </p>
1005 </dd>
1007 --shortstat
1008 </dt>
1009 <dd>
1010 <p>
1012 number of modified files, as well as number of added and deleted
1013 lines.
1014 </p>
1015 </dd>
1018 </dt>
1021 </dt>
1022 <dd>
1023 <p>
1024 Output the distribution of relative amount of changes for each
1026 passing it a comma separated list of parameters.
1029 The following parameters are available:
1030 </p>
1036 </dt>
1037 <dd>
1038 <p>
1039 Compute the dirstat numbers by counting the lines that have been
1040 removed from the source, or added to the destination. This ignores
1041 the amount of pure code movements within a file. In other words,
1042 rearranging lines in a file is not counted as much as other changes.
1043 This is the default behavior when no parameter is given.
1044 </p>
1045 </dd>
1048 </dt>
1049 <dd>
1050 <p>
1051 Compute the dirstat numbers by doing the regular line-based diff
1052 analysis, and summing the removed/added line counts. (For binary
1053 files, count 64-byte chunks instead, since binary files have no
1056 lines within a file as much as other changes. The resulting output
1058 </p>
1059 </dd>
1062 </dt>
1063 <dd>
1064 <p>
1065 Compute the dirstat numbers by counting the number of files changed.
1066 Each changed file counts equally in the dirstat analysis. This is
1068 not have to look at the file contents at all.
1069 </p>
1070 </dd>
1073 </dt>
1074 <dd>
1075 <p>
1076 Count changes in a child directory for the parent directory as well.
1078 reported may exceed 100%. The default (non-cumulative) behavior can
1080 </p>
1081 </dd>
1084 </dt>
1085 <dd>
1086 <p>
1087 An integer parameter specifies a cut-off percent (3% by default).
1088 Directories contributing less than this percentage of the changes
1089 are not shown in the output.
1090 </p>
1091 </dd>
1092 </dl></div>
1093 </div></div>
1095 directories with less than 10% of the total amount of changed files,
1096 and accumulating child directory counts in the parent directories:
1098 </dd>
1100 --cumulative
1101 </dt>
1102 <dd>
1103 <p>
1104 Synonym for --dirstat=cumulative
1105 </p>
1106 </dd>
1109 </dt>
1110 <dd>
1111 <p>
1113 </p>
1114 </dd>
1116 --summary
1117 </dt>
1118 <dd>
1119 <p>
1120 Output a condensed summary of extended header information
1121 such as creations, renames and mode changes.
1122 </p>
1123 </dd>
1125 --patch-with-stat
1126 </dt>
1127 <dd>
1128 <p>
1130 </p>
1131 </dd>
1133 -z
1134 </dt>
1135 <dd>
1136 <p>
1137 When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
1138 given, do not munge pathnames and use NULs as output field terminators.
1139 </p>
1140 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1143 </dd>
1145 --name-only
1146 </dt>
1147 <dd>
1148 <p>
1149 Show only the name of each changed file in the post-image tree.
1150 The file names are often encoded in UTF-8.
1151 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1152 manual page.
1153 </p>
1154 </dd>
1156 --name-status
1157 </dt>
1158 <dd>
1159 <p>
1160 Show only the name(s) and status of each changed file. See the description
1163 </p>
1164 </dd>
1167 </dt>
1168 <dd>
1169 <p>
1170 Specify how differences in submodules are shown. When specifying
1172 shows the names of the commits at the beginning and end of the range.
1174 format is used. This format lists the commits in the range like
1175 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1177 inline diff of the changes in the submodule contents between the
1179 if the config option is unset.
1180 </p>
1181 </dd>
1184 </dt>
1185 <dd>
1186 <p>
1187 Show colored diff.
1188 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
1189 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
1190 </p>
1191 </dd>
1193 --no-color
1194 </dt>
1195 <dd>
1196 <p>
1197 Turn off colored diff.
1199 </p>
1200 </dd>
1203 </dt>
1204 <dd>
1205 <p>
1206 Moved lines of code are colored differently.
1209 The mode must be one of:
1210 </p>
1215 no
1216 </dt>
1217 <dd>
1218 <p>
1219 Moved lines are not highlighted.
1220 </p>
1221 </dd>
1223 default
1224 </dt>
1225 <dd>
1226 <p>
1228 in the future.
1229 </p>
1230 </dd>
1232 plain
1233 </dt>
1234 <dd>
1235 <p>
1236 Any line that is added in one location and was removed
1239 that are added somewhere else in the diff. This mode picks up any
1240 moved line, but it is not very useful in a review to determine
1241 if a block of code was moved without permutation.
1242 </p>
1243 </dd>
1245 blocks
1246 </dt>
1247 <dd>
1248 <p>
1249 Blocks of moved text of at least 20 alphanumeric characters
1250 are detected greedily. The detected blocks are
1252 Adjacent blocks cannot be told apart.
1253 </p>
1254 </dd>
1256 zebra
1257 </dt>
1258 <dd>
1259 <p>
1263 the two colors indicates that a new block was detected.
1264 </p>
1265 </dd>
1267 dimmed-zebra
1268 </dt>
1269 <dd>
1270 <p>
1272 of moved code is performed. The bordering lines of two adjacent
1273 blocks are considered interesting, the rest is uninteresting.
1275 </p>
1276 </dd>
1277 </dl></div>
1278 </div></div>
1279 </dd>
1281 --no-color-moved
1282 </dt>
1283 <dd>
1284 <p>
1285 Turn off move detection. This can be used to override configuration
1287 </p>
1288 </dd>
1291 </dt>
1292 <dd>
1293 <p>
1294 This configures how whitespace is ignored when performing the
1296 These modes can be given as a comma separated list:
1297 </p>
1302 no
1303 </dt>
1304 <dd>
1305 <p>
1306 Do not ignore whitespace when performing move detection.
1307 </p>
1308 </dd>
1310 ignore-space-at-eol
1311 </dt>
1312 <dd>
1313 <p>
1314 Ignore changes in whitespace at EOL.
1315 </p>
1316 </dd>
1318 ignore-space-change
1319 </dt>
1320 <dd>
1321 <p>
1322 Ignore changes in amount of whitespace. This ignores whitespace
1323 at line end, and considers all other sequences of one or
1324 more whitespace characters to be equivalent.
1325 </p>
1326 </dd>
1328 ignore-all-space
1329 </dt>
1330 <dd>
1331 <p>
1332 Ignore whitespace when comparing lines. This ignores differences
1333 even if one line has whitespace where the other line has none.
1334 </p>
1335 </dd>
1337 allow-indentation-change
1338 </dt>
1339 <dd>
1340 <p>
1341 Initially ignore any whitespace in the move detection, then
1342 group the moved code blocks only into a block if the change in
1343 whitespace is the same per line. This is incompatible with the
1344 other modes.
1345 </p>
1346 </dd>
1347 </dl></div>
1348 </div></div>
1349 </dd>
1351 --no-color-moved-ws
1352 </dt>
1353 <dd>
1354 <p>
1355 Do not ignore whitespace when performing move detection. This can be
1356 used to override configuration settings. It is the same as
1358 </p>
1359 </dd>
1362 </dt>
1363 <dd>
1364 <p>
1366 By default, words are delimited by whitespace; see
1368 must be one of:
1369 </p>
1374 color
1375 </dt>
1376 <dd>
1377 <p>
1379 </p>
1380 </dd>
1382 plain
1383 </dt>
1384 <dd>
1385 <p>
1387 attempts to escape the delimiters if they appear in the input,
1388 so the output may be ambiguous.
1389 </p>
1390 </dd>
1392 porcelain
1393 </dt>
1394 <dd>
1395 <p>
1396 Use a special line-based format intended for script
1397 consumption. Added/removed/unchanged runs are printed in the
1399 character at the beginning of the line and extending to the
1400 end of the line. Newlines in the input are represented by a
1402 </p>
1403 </dd>
1405 none
1406 </dt>
1407 <dd>
1408 <p>
1409 Disable word diff again.
1410 </p>
1411 </dd>
1412 </dl></div>
1413 </div></div>
1415 highlight the changed parts in all modes if enabled.</p></div>
1416 </dd>
1419 </dt>
1420 <dd>
1421 <p>
1423 runs of non-whitespace to be a word. Also implies
1425 </p>
1428 considered whitespace and ignored(!) for the purposes of finding
1430 expression to make sure that it matches all non-whitespace characters.
1431 A match that contains a newline is silently truncated(!) at the
1432 newline.</p></div>
1433 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1434 and, correspondingly, show differences character by character.</p></div>
1435 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1436 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
1437 overrides any diff driver or configuration setting. Diff drivers
1438 override configuration settings.</p></div>
1439 </dd>
1442 </dt>
1443 <dd>
1444 <p>
1447 </p>
1448 </dd>
1450 --no-renames
1451 </dt>
1452 <dd>
1453 <p>
1454 Turn off rename detection, even when the configuration
1455 file gives the default to do so.
1456 </p>
1457 </dd>
1459 --[no-]rename-empty
1460 </dt>
1461 <dd>
1462 <p>
1463 Whether to use empty blobs as rename source.
1464 </p>
1465 </dd>
1467 --check
1468 </dt>
1469 <dd>
1470 <p>
1471 Warn if changes introduce conflict markers or whitespace errors.
1473 configuration. By default, trailing whitespaces (including
1474 lines that consist solely of whitespaces) and a space character
1475 that is immediately followed by a tab character inside the
1476 initial indent of the line are considered whitespace errors.
1477 Exits with non-zero status if problems are found. Not compatible
1478 with --exit-code.
1479 </p>
1480 </dd>
1483 </dt>
1484 <dd>
1485 <p>
1487 lines of the diff. Multiple values are separated by comma,
1490 this option is not given, and the configuration variable
1494 </p>
1495 </dd>
1497 --full-index
1498 </dt>
1499 <dd>
1500 <p>
1501 Instead of the first handful of characters, show the full
1502 pre- and post-image blob object names on the "index"
1503 line when generating patch format output.
1504 </p>
1505 </dd>
1507 --binary
1508 </dt>
1509 <dd>
1510 <p>
1514 </p>
1515 </dd>
1518 </dt>
1519 <dd>
1520 <p>
1521 Instead of showing the full 40-byte hexadecimal object
1522 name in diff-raw format output and diff-tree header
1524 hexdigits long that uniquely refers the object.
1529 </p>
1530 </dd>
1533 </dt>
1536 </dt>
1537 <dd>
1538 <p>
1539 Break complete rewrite changes into pairs of delete and
1540 create. This serves two purposes:
1541 </p>
1542 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1543 not as a series of deletion and insertion mixed together with a very
1544 few lines that happen to match textually as the context, but as a
1545 single deletion of everything old followed by a single insertion of
1548 original should remain in the result for Git to consider it a total
1549 rewrite (i.e. otherwise the resulting patch will be a series of
1550 deletion and insertion mixed together with context lines).</p></div>
1551 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1552 source of a rename (usually -M only considers a file that disappeared
1556 eligible for being picked up as a possible source of a rename to
1557 another file.</p></div>
1558 </dd>
1561 </dt>
1564 </dt>
1565 <dd>
1566 <p>
1567 Detect renames.
1569 index (i.e. amount of addition/deletions compared to the
1571 delete/add pair to be a rename if more than 90% of the file
1577 </p>
1578 </dd>
1581 </dt>
1584 </dt>
1585 <dd>
1586 <p>
1589 </p>
1590 </dd>
1592 --find-copies-harder
1593 </dt>
1594 <dd>
1595 <p>
1597 if the original file of the copy was modified in the same
1598 changeset. This flag makes the command
1599 inspect unmodified files as candidates for the source of
1600 copy. This is a very expensive operation for large
1601 projects, so use it with caution. Giving more than one
1603 </p>
1604 </dd>
1606 -D
1607 </dt>
1609 --irreversible-delete
1610 </dt>
1611 <dd>
1612 <p>
1613 Omit the preimage for deletes, i.e. print only the header but not
1616 solely for people who want to just concentrate on reviewing the
1617 text after the change. In addition, the output obviously lacks
1618 enough information to apply such a patch in reverse, even manually,
1619 hence the name of the option.
1620 </p>
1621 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1622 of a delete/create pair.</p></div>
1623 </dd>
1626 </dt>
1627 <dd>
1628 <p>
1630 can detect subsets of renames/copies cheaply, followed by an
1631 exhaustive fallback portion that compares all remaining
1632 unpaired destinations to all relevant sources. (For renames,
1633 only remaining unpaired sources are relevant; for copies, all
1634 original sources are relevant.) For N sources and
1635 destinations, this exhaustive check is O(N^2). This option
1636 prevents the exhaustive portion of rename/copy detection from
1637 running if the number of source/destination files involved
1638 exceeds the specified number. Defaults to diff.renameLimit.
1639 Note that a value of 0 is treated as unlimited.
1640 </p>
1641 </dd>
1643 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1644 </dt>
1645 <dd>
1646 <p>
1652 Any combination of the filter characters (including none) can be used.
1654 paths are selected if there is any file that matches
1655 other criteria in the comparison; if there is no file
1656 that matches other criteria, nothing is selected.
1657 </p>
1660 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1661 renamed entries cannot appear if detection for those types is disabled.</p></div>
1662 </dd>
1665 </dt>
1666 <dd>
1667 <p>
1668 Look for differences that change the number of occurrences of
1669 the specified string (i.e. addition/deletion) in a file.
1670 Intended for the scripter’s use.
1671 </p>
1672 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
1673 struct), and want to know the history of that block since it first
1674 came into being: use the feature iteratively to feed the interesting
1676 very first version of the block.</p></div>
1678 </dd>
1681 </dt>
1682 <dd>
1683 <p>
1684 Look for differences whose patch text contains added/removed
1686 </p>
1687 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
1689 file:</p></div>
1693 ...
1695 </div></div>
1696 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1698 occurrences of that string did not change).</p></div>
1699 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1700 filter will be ignored.</p></div>
1701 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1702 information.</p></div>
1703 </dd>
1706 </dt>
1707 <dd>
1708 <p>
1709 Look for differences that change the number of occurrences of
1711 in that it doesn’t search for a specific string but for a specific
1712 object id.
1713 </p>
1714 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1716 </dd>
1718 --pickaxe-all
1719 </dt>
1720 <dd>
1721 <p>
1723 changeset, not just the files that contain the change
1725 </p>
1726 </dd>
1728 --pickaxe-regex
1729 </dt>
1730 <dd>
1731 <p>
1733 expression to match.
1734 </p>
1735 </dd>
1738 </dt>
1739 <dd>
1740 <p>
1741 Control the order in which files appear in the output.
1745 </p>
1748 All files with pathnames that match the first pattern are output
1749 first, all files with pathnames that match the second pattern (but not
1750 the first) are output next, and so on.
1751 All files with pathnames that do not match any pattern are output
1752 last, as if there was an implicit match-all pattern at the end of the
1753 file.
1754 If multiple pathnames have the same rank (they match the same pattern
1755 but no earlier patterns), their output order relative to each other is
1756 the normal order.</p></div>
1761 <li>
1762 <p>
1763 Blank lines are ignored, so they can be used as separators for
1764 readability.
1765 </p>
1766 </li>
1767 <li>
1768 <p>
1769 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1770 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1771 pattern if it starts with a hash.
1772 </p>
1773 </li>
1774 <li>
1775 <p>
1776 Each other line contains a single pattern.
1777 </p>
1778 </li>
1779 </ul></div>
1780 </div></div>
1782 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1783 matches a pattern if removing any number of the final pathname
1784 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1785 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
1786 </dd>
1789 </dt>
1792 </dt>
1793 <dd>
1794 <p>
1799 otherwise.
1800 </p>
1801 </dd>
1803 -R
1804 </dt>
1805 <dd>
1806 <p>
1807 Swap two inputs; that is, show differences from index or
1808 on-disk file to tree contents.
1809 </p>
1810 </dd>
1813 </dt>
1815 --no-relative
1816 </dt>
1817 <dd>
1818 <p>
1819 When run from a subdirectory of the project, it can be
1820 told to exclude changes outside the directory and show
1821 pathnames relative to it with this option. When you are
1822 not in a subdirectory (e.g. in a bare repository), you
1823 can name which subdirectory to make the output relative
1827 </p>
1828 </dd>
1830 -a
1831 </dt>
1833 --text
1834 </dt>
1835 <dd>
1836 <p>
1837 Treat all files as text.
1838 </p>
1839 </dd>
1841 --ignore-cr-at-eol
1842 </dt>
1843 <dd>
1844 <p>
1845 Ignore carriage-return at the end of line when doing a comparison.
1846 </p>
1847 </dd>
1849 --ignore-space-at-eol
1850 </dt>
1851 <dd>
1852 <p>
1853 Ignore changes in whitespace at EOL.
1854 </p>
1855 </dd>
1857 -b
1858 </dt>
1860 --ignore-space-change
1861 </dt>
1862 <dd>
1863 <p>
1864 Ignore changes in amount of whitespace. This ignores whitespace
1865 at line end, and considers all other sequences of one or
1866 more whitespace characters to be equivalent.
1867 </p>
1868 </dd>
1870 -w
1871 </dt>
1873 --ignore-all-space
1874 </dt>
1875 <dd>
1876 <p>
1877 Ignore whitespace when comparing lines. This ignores
1878 differences even if one line has whitespace where the other
1879 line has none.
1880 </p>
1881 </dd>
1883 --ignore-blank-lines
1884 </dt>
1885 <dd>
1886 <p>
1887 Ignore changes whose lines are all blank.
1888 </p>
1889 </dd>
1892 </dt>
1895 </dt>
1896 <dd>
1897 <p>
1899 be specified more than once.
1900 </p>
1901 </dd>
1904 </dt>
1905 <dd>
1906 <p>
1907 Show the context between diff hunks, up to the specified number
1908 of lines, thereby fusing hunks that are close to each other.
1910 is unset.
1911 </p>
1912 </dd>
1914 -W
1915 </dt>
1917 --function-context
1918 </dt>
1919 <dd>
1920 <p>
1921 Show whole function as context lines for each change.
1922 The function names are determined in the same way as
1925 </p>
1926 </dd>
1928 --exit-code
1929 </dt>
1930 <dd>
1931 <p>
1932 Make the program exit with codes similar to diff(1).
1933 That is, it exits with 1 if there were differences and
1934 0 means no differences.
1935 </p>
1936 </dd>
1938 --quiet
1939 </dt>
1940 <dd>
1941 <p>
1943 </p>
1944 </dd>
1946 --ext-diff
1947 </dt>
1948 <dd>
1949 <p>
1950 Allow an external diff helper to be executed. If you set an
1953 </p>
1954 </dd>
1956 --no-ext-diff
1957 </dt>
1958 <dd>
1959 <p>
1960 Disallow external diff drivers.
1961 </p>
1962 </dd>
1964 --textconv
1965 </dt>
1967 --no-textconv
1968 </dt>
1969 <dd>
1970 <p>
1971 Allow (or disallow) external text conversion filters to be run
1973 details. Because textconv filters are typically a one-way
1974 conversion, the resulting diff is suitable for human
1975 consumption, but cannot be applied. For this reason, textconv
1977 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1978 diff plumbing commands.
1979 </p>
1980 </dd>
1983 </dt>
1984 <dd>
1985 <p>
1988 Using "none" will consider the submodule modified when it either contains
1989 untracked or modified files or its HEAD differs from the commit recorded
1990 in the superproject and can be used to override any settings of the
1991 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1992 "untracked" is used submodules are not considered dirty when they only
1993 contain untracked content (but they are still scanned for modified
1994 content). Using "dirty" ignores all changes to the work tree of submodules,
1995 only changes to the commits stored in the superproject are shown (this was
1997 </p>
1998 </dd>
2001 </dt>
2002 <dd>
2003 <p>
2004 Show the given source prefix instead of "a/".
2005 </p>
2006 </dd>
2009 </dt>
2010 <dd>
2011 <p>
2012 Show the given destination prefix instead of "b/".
2013 </p>
2014 </dd>
2016 --no-prefix
2017 </dt>
2018 <dd>
2019 <p>
2020 Do not show any source or destination prefix.
2021 </p>
2022 </dd>
2024 --default-prefix
2025 </dt>
2026 <dd>
2027 <p>
2032 </p>
2033 </dd>
2036 </dt>
2037 <dd>
2038 <p>
2039 Prepend an additional prefix to every line of output.
2040 </p>
2041 </dd>
2043 --ita-invisible-in-index
2044 </dt>
2045 <dd>
2046 <p>
2047 By default entries added by "git add -N" appear as an existing
2049 This option makes the entry appear as a new file in "git diff"
2050 and non-existent in "git diff --cached". This option could be
2052 experimental and could be removed in future.
2053 </p>
2054 </dd>
2055 </dl></div>
2061 </dt>
2062 <dd>
2063 <p>
2064 The id of a tree object to diff against.
2065 </p>
2066 </dd>
2068 --cached
2069 </dt>
2070 <dd>
2071 <p>
2072 Do not consider the on-disk file at all.
2073 </p>
2074 </dd>
2076 --merge-base
2077 </dt>
2078 <dd>
2079 <p>
2082 commit.
2083 </p>
2084 </dd>
2086 -m
2087 </dt>
2088 <dd>
2089 <p>
2090 By default, files recorded in the index but not checked
2091 out are reported as deleted. This flag makes
2093 to date.
2094 </p>
2095 </dd>
2096 </dl></div>
2097 </div>
2098 </div>
2105 compared differs:</p></div>
2109 </dt>
2110 <dd>
2111 <p>
2113 </p>
2114 </dd>
2117 </dt>
2118 <dd>
2119 <p>
2121 </p>
2122 </dd>
2125 </dt>
2126 <dd>
2127 <p>
2128 compares the trees named by the two arguments.
2129 </p>
2130 </dd>
2133 </dt>
2134 <dd>
2135 <p>
2136 compares the index and the files on the filesystem.
2137 </p>
2138 </dd>
2139 </dl></div>
2140 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
2141 what is being compared. After that, all the commands print one output
2142 line per changed file.</p></div>
2149 create :000000 100644 0000000 1234567 A file4
2150 delete :100644 000000 1234567 0000000 D file5
2152 </div></div>
2155 <li>
2156 <p>
2157 a colon.
2158 </p>
2159 </li>
2160 <li>
2161 <p>
2163 </p>
2164 </li>
2165 <li>
2166 <p>
2167 a space.
2168 </p>
2169 </li>
2170 <li>
2171 <p>
2173 </p>
2174 </li>
2175 <li>
2176 <p>
2177 a space.
2178 </p>
2179 </li>
2180 <li>
2181 <p>
2183 </p>
2184 </li>
2185 <li>
2186 <p>
2187 a space.
2188 </p>
2189 </li>
2190 <li>
2191 <p>
2193 </p>
2194 </li>
2195 <li>
2196 <p>
2197 a space.
2198 </p>
2199 </li>
2200 <li>
2201 <p>
2202 status, followed by optional "score" number.
2203 </p>
2204 </li>
2205 <li>
2206 <p>
2208 </p>
2209 </li>
2210 <li>
2211 <p>
2212 path for "src"
2213 </p>
2214 </li>
2215 <li>
2216 <p>
2218 </p>
2219 </li>
2220 <li>
2221 <p>
2222 path for "dst"; only exists for C or R.
2223 </p>
2224 </li>
2225 <li>
2226 <p>
2228 </p>
2229 </li>
2230 </ol></div>
2233 <li>
2234 <p>
2235 A: addition of a file
2236 </p>
2237 </li>
2238 <li>
2239 <p>
2240 C: copy of a file into a new one
2241 </p>
2242 </li>
2243 <li>
2244 <p>
2245 D: deletion of a file
2246 </p>
2247 </li>
2248 <li>
2249 <p>
2250 M: modification of the contents or mode of a file
2251 </p>
2252 </li>
2253 <li>
2254 <p>
2255 R: renaming of a file
2256 </p>
2257 </li>
2258 <li>
2259 <p>
2260 T: change in the type of the file (regular file, symbolic link or submodule)
2261 </p>
2262 </li>
2263 <li>
2264 <p>
2265 U: file is unmerged (you must complete the merge before it can
2266 be committed)
2267 </p>
2268 </li>
2269 <li>
2270 <p>
2271 X: "unknown" change type (most probably a bug, please report it)
2272 </p>
2273 </li>
2274 </ul></div>
2276 percentage of similarity between the source and target of the move or
2277 copy). Status letter M may be followed by a score (denoting the
2278 percentage of dissimilarity) for file rewrites.</p></div>
2279 <div class="paragraph"><p>The sha1 for "dst" is shown as all 0’s if a file on the filesystem
2280 is out of sync with the index.</p></div>
2285 </div></div>
2286 <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2288 (see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2289 verbatim and the line is terminated by a NUL byte.</p></div>
2290 </div>
2291 </div>
2297 to generate diff output also for merge commits. The output differs
2298 from the format described above in the following way:</p></div>
2300 <li>
2301 <p>
2302 there is a colon for each parent
2303 </p>
2304 </li>
2305 <li>
2306 <p>
2308 </p>
2309 </li>
2310 <li>
2311 <p>
2312 status is concatenated status characters for each parent
2313 </p>
2314 </li>
2315 <li>
2316 <p>
2317 no optional "score" number
2318 </p>
2319 </li>
2320 <li>
2321 <p>
2322 tab-separated pathname(s) of the file
2323 </p>
2324 </li>
2325 </ol></div>
2326 <div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2327 if the file was renamed on any side of history. With
2329 followed by the name of the path in the merge commit.</p></div>
2330 <div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
2336 </div></div>
2337 <div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2343 </div></div>
2344 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2345 all parents.</p></div>
2346 </div>
2347 </div>
2359 You can customize the creation of patch text via the
2361 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
2362 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2363 diff format:</p></div>
2365 <li>
2366 <p>
2367 It is preceded by a "git diff" header that looks like this:
2368 </p>
2372 </div></div>
2373 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
2374 involved. Especially, even for a creation or a deletion,
2375 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2376 <div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
2377 name of the source file of the rename/copy and the name of
2378 the file that the rename/copy produces, respectively.</p></div>
2379 </li>
2380 <li>
2381 <p>
2382 It is followed by one or more extended header lines:
2383 </p>
2397 </div></div>
2398 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2399 and file permission bits.</p></div>
2400 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
2402 the dissimilarity index is the percentage of changed lines. It
2403 is a rounded down integer, followed by a percent sign. The
2404 similarity index value of 100% is thus reserved for two equal
2405 files, while 100% dissimilarity means that no line from the old
2406 file made it into the new one.</p></div>
2407 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
2409 separate lines indicate the old and the new mode.</p></div>
2410 </li>
2411 <li>
2412 <p>
2413 Pathnames with "unusual" characters are quoted as explained for
2416 </p>
2417 </li>
2418 <li>
2419 <p>
2422 It is incorrect to apply each change to each file sequentially. For
2423 example, this patch will swap a and b:
2424 </p>
2427 <pre><code>diff --git a/a b/b
2428 rename from a
2429 rename to b
2430 diff --git a/b b/a
2431 rename from b
2432 rename to a</code></pre>
2433 </div></div>
2434 </li>
2435 <li>
2436 <p>
2437 Hunk headers mention the name of the function to which the hunk
2438 applies. See "Defining a custom hunk-header" in
2440 specific languages.
2441 </p>
2442 </li>
2443 </ol></div>
2444 </div>
2445 </div>
2449 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
2454 diffs in a specific format.</p></div>
2458 <pre><code>diff --combined describe.c
2459 index fabadb8,cc95eb0..4866510
2460 --- a/describe.c
2461 +++ b/describe.c
2464 }
2466 - static void describe(char *arg)
2467 -static void describe(struct commit *cmit, int last_one)
2468 ++static void describe(char *arg, int last_one)
2469 {
2470 + unsigned char sha1[20];
2471 + struct commit *cmit;
2472 struct commit_list *list;
2473 static int initialized = 0;
2474 struct commit_name *n;
2477 + usage(describe_usage);
2478 + cmit = lookup_commit_reference(sha1);
2479 + if (!cmit)
2480 + usage(describe_usage);
2481 +
2482 if (!initialized) {
2483 initialized = 1;
2484 for_each_ref(get_name);</code></pre>
2485 </div></div>
2487 <li>
2488 <p>
2489 It is preceded by a "git diff" header, that looks like
2491 </p>
2495 </div></div>
2500 </div></div>
2501 </li>
2502 <li>
2503 <p>
2504 It is followed by one or more extended header lines
2505 (this example shows a merge with two parents):
2506 </p>
2513 </div></div>
2514 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
2516 information about detected content movement (renames and
2517 copying detection) are designed to work with the diff of two
2519 </li>
2520 <li>
2521 <p>
2522 It is followed by a two-line from-file/to-file header:
2523 </p>
2526 <pre><code>--- a/file
2527 +++ b/file</code></pre>
2528 </div></div>
2529 <div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
2531 files.</p></div>
2532 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2533 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
2534 where N is the number of parents in the merge commit:</p></div>
2537 <pre><code>--- a/file
2538 --- a/file
2539 --- a/file
2540 +++ b/file</code></pre>
2541 </div></div>
2543 active, to allow you to see the original name of the file in different
2544 parents.</p></div>
2545 </li>
2546 <li>
2547 <p>
2548 Chunk header format is modified to prevent people from
2550 was created for review of merge commit changes, and was not
2551 meant to be applied. The change is similar to the change in the
2553 </p>
2556 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
2557 </div></div>
2558 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
2559 header for combined diff format.</p></div>
2560 </li>
2561 </ol></div>
2563 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
2565 compares two or more files file1, file2,… with one file X, and
2566 shows how X differs from each of fileN. One column for each of
2567 fileN is prepended to the output line to note how X’s line is
2568 different from it.</p></div>
2569 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2571 in the column N means that the line appears in the result,
2572 and fileN does not have that line (in other words, the line was
2573 added, from the point of view of that parent).</p></div>
2577 in either file1 or file2). Also, eight other lines are the same
2579 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
2580 merge commit with the merge result (i.e. file1..fileN are the
2582 two unresolved merge parents with the working tree file
2585 </div>
2586 </div>
2590 <div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2592 output. These options can be combined with other options, such as
2594 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
2595 formats the pathnames compactly by combining common prefix and suffix of
2601 </div></div>
2602 <div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2604 like this:</p></div>
2609 </div></div>
2612 <li>
2613 <p>
2614 the number of added lines;
2615 </p>
2616 </li>
2617 <li>
2618 <p>
2619 a tab;
2620 </p>
2621 </li>
2622 <li>
2623 <p>
2624 the number of deleted lines;
2625 </p>
2626 </li>
2627 <li>
2628 <p>
2629 a tab;
2630 </p>
2631 </li>
2632 <li>
2633 <p>
2634 pathname (possibly with rename/copy information);
2635 </p>
2636 </li>
2637 <li>
2638 <p>
2639 a newline.
2640 </p>
2641 </li>
2642 </ol></div>
2643 <div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
2648 </div></div>
2651 <li>
2652 <p>
2653 the number of added lines;
2654 </p>
2655 </li>
2656 <li>
2657 <p>
2658 a tab;
2659 </p>
2660 </li>
2661 <li>
2662 <p>
2663 the number of deleted lines;
2664 </p>
2665 </li>
2666 <li>
2667 <p>
2668 a tab;
2669 </p>
2670 </li>
2671 <li>
2672 <p>
2673 a NUL (only exists if renamed/copied);
2674 </p>
2675 </li>
2676 <li>
2677 <p>
2678 pathname in preimage;
2679 </p>
2680 </li>
2681 <li>
2682 <p>
2683 a NUL (only exists if renamed/copied);
2684 </p>
2685 </li>
2686 <li>
2687 <p>
2688 pathname in postimage (only exists if renamed/copied);
2689 </p>
2690 </li>
2691 <li>
2692 <p>
2693 a NUL.
2694 </p>
2695 </li>
2696 </ol></div>
2697 <div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
2698 scripts that read the output to tell if the current record being read is
2699 a single-path record or a rename/copy record without reading ahead.
2702 </div>
2703 </div>
2710 of these operations are very useful indeed.</p></div>
2711 </div>
2712 </div>
2716 <div class="paragraph"><p>If <code>--cached</code> is specified, it allows you to ask:</p></div>
2719 <pre><code>show me the differences between HEAD and the current index
2720 contents (the ones I'd write using 'git write-tree')</code></pre>
2721 </div></div>
2722 <div class="paragraph"><p>For example, let’s say that you have worked on your working directory, updated
2723 some files in the index and are ready to commit. You want to see exactly
2725 object and compare it that way, and to do that, you just do</p></div>
2729 </div></div>
2730 <div class="paragraph"><p>Example: let’s say I had renamed <code>commit.c</code> to <code>git-commit.c</code>, and I had
2737 :100644 000000 4161aecc6700a2eb579e842af0b7f22b98443f74 0000000000000000000000000000000000000000 D commit.c
2738 :000000 100644 0000000000000000000000000000000000000000 4161aecc6700a2eb579e842af0b7f22b98443f74 A git-commit.c</code></pre>
2739 </div></div>
2741 <div class="paragraph"><p>In fact, <code>git diff-index --cached</code> <strong>should</strong> always be entirely equivalent to
2743 nicer for the case where you just want to check where you are.</p></div>
2744 <div class="paragraph"><p>So doing a <code>git diff-index --cached</code> is basically very useful when you are
2745 asking yourself "what have I already marked for being committed, and
2747 </div>
2748 </div>
2753 the more useful of the two in that what it does can’t be emulated with
2755 The non-cached version asks the question:</p></div>
2758 <pre><code>show me the differences between HEAD and the currently checked out
2759 tree - index contents _and_ files that aren't up to date</code></pre>
2760 </div></div>
2761 <div class="paragraph"><p>which is obviously a very useful question too, since that tells you what
2763 output to a tee, but with a twist.</p></div>
2764 <div class="paragraph"><p>The twist is that if some file doesn’t match the index, we don’t have
2765 a backing store thing for it, and we use the magic "all-zero" sha1 to
2773 </div></div>
2774 <div class="paragraph"><p>i.e., it shows that the tree has changed, and that <code>kernel/sched.c</code> is
2775 not up to date and may contain new stuff. The all-zero sha1 means that to
2776 get the real diff, you need to look at the object in the working directory
2777 directly rather than do an object-to-object diff.</p></div>
2779 <table><tr>
2782 </td>
2784 actually look at the contents of the file at all. So maybe
2786 touched it. In either case, it’s a note that you need to
2788 </tr></table>
2789 </div>
2791 <table><tr>
2794 </td>
2796 and "is still dirty in the working directory" together. You can always
2797 tell which file is in which state, since the "has been updated" ones
2798 show a valid sha1, and the "not in sync with the index" ones will
2799 always have the special all-zero sha1.</td>
2800 </tr></table>
2801 </div>
2802 </div>
2803 </div>
2808 </div>
2809 </div>
2810 </div>
2814 Last updated
2816 </div>
2817 </div>
2818 </body>
2819 </html>