| blob | f1084917714c53b1263096e93de12a2c67964b48 |
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(1) Manual Page
739 </h1>
742 <p>git-diff -
743 Show changes between commits, commit and working tree, etc
744 </p>
745 </div>
746 </div>
752 <pre class="content"><em>git diff</em> [<options>] [<commit>] [--] [<path>…]
753 <em>git diff</em> [<options>] --cached [--merge-base] [<commit>] [--] [<path>…]
754 <em>git diff</em> [<options>] [--merge-base] <commit> [<commit>…] <commit> [--] [<path>…]
755 <em>git diff</em> [<options>] <commit>…<commit> [--] [<path>…]
759 </div></div>
760 </div>
761 </div>
765 <div class="paragraph"><p>Show changes between the working tree and the index or a tree, changes
766 between the index and a tree, changes between two trees, changes resulting
767 from a merge, changes between two blob objects, or changes between two
768 files on disk.</p></div>
772 </dt>
773 <dd>
774 <p>
775 This form is to view the changes you made relative to
776 the index (staging area for the next commit). In other
778 further add to the index but you still haven’t. You can
780 </p>
781 </dd>
784 </dt>
785 <dd>
786 <p>
787 This form is to compare the given two paths on the
789 running the command in a working tree controlled by Git and
790 at least one of the paths points outside the working tree,
791 or when running the command outside a working tree
793 </p>
794 </dd>
796 <em>git diff</em> [<options>] --cached [--merge-base] [<commit>] [--] [<path>…]
797 </dt>
798 <dd>
799 <p>
800 This form is to view the changes you staged for the next
802 would want comparison with the latest commit, so if you
804 If HEAD does not exist (e.g. unborn branches) and
806 --staged is a synonym of --cached.
807 </p>
808 <div class="paragraph"><p>If --merge-base is given, instead of using <commit>, use the merge base
811 </dd>
814 </dt>
815 <dd>
816 <p>
817 This form is to view the changes you have in your
819 use HEAD to compare it with the latest commit, or a
820 branch name to compare with the tip of a different
821 branch.
822 </p>
823 <div class="paragraph"><p>If --merge-base is given, instead of using <commit>, use the merge base
826 </dd>
828 <em>git diff</em> [<options>] [--merge-base] <commit> <commit> [--] [<path>…]
829 </dt>
830 <dd>
831 <p>
832 This is to view the changes between two arbitrary
834 </p>
835 <div class="paragraph"><p>If --merge-base is given, use the merge base of the two commits for the
838 </dd>
840 <em>git diff</em> [<options>] <commit> <commit>… <commit> [--] [<path>…]
841 </dt>
842 <dd>
843 <p>
844 This form is to view the results of a merge commit. The first
846 more commits should be its parents. Convenient ways to produce
850 </p>
851 </dd>
854 </dt>
855 <dd>
856 <p>
859 one side is omitted, it will have the same effect as
860 using HEAD instead.
861 </p>
862 </dd>
865 </dt>
866 <dd>
867 <p>
868 This form is to view the changes on the branch containing
873 </p>
874 </dd>
875 </dl></div>
883 so far to resolve textual conflicts (see the examples below).</p></div>
893 </dt>
894 <dd>
895 <p>
896 This form is to view the differences between the raw
897 contents of two blob objects.
898 </p>
899 </dd>
900 </dl></div>
901 </div>
902 </div>
908 -p
909 </dt>
911 -u
912 </dt>
914 --patch
915 </dt>
916 <dd>
917 <p>
919 This is the default.
920 </p>
921 </dd>
923 -s
924 </dt>
926 --no-patch
927 </dt>
928 <dd>
929 <p>
930 Suppress all output from the diff machinery. Useful for
932 squelch their output, or to cancel the effect of options like
934 </p>
935 </dd>
938 </dt>
941 </dt>
942 <dd>
943 <p>
945 the usual three.
947 </p>
948 </dd>
951 </dt>
952 <dd>
953 <p>
954 Output to a specific file instead of stdout.
955 </p>
956 </dd>
959 </dt>
962 </dt>
965 </dt>
966 <dd>
967 <p>
968 Specify the character used to indicate new, old or context
970 ' ' respectively.
971 </p>
972 </dd>
974 --raw
975 </dt>
976 <dd>
977 <p>
978 Generate the diff in raw format.
979 </p>
980 </dd>
982 --patch-with-raw
983 </dt>
984 <dd>
985 <p>
987 </p>
988 </dd>
990 --indent-heuristic
991 </dt>
992 <dd>
993 <p>
994 Enable the heuristic that shifts diff hunk boundaries to make patches
995 easier to read. This is the default.
996 </p>
997 </dd>
999 --no-indent-heuristic
1000 </dt>
1001 <dd>
1002 <p>
1003 Disable the indent heuristic.
1004 </p>
1005 </dd>
1007 --minimal
1008 </dt>
1009 <dd>
1010 <p>
1011 Spend extra time to make sure the smallest possible
1012 diff is produced.
1013 </p>
1014 </dd>
1016 --patience
1017 </dt>
1018 <dd>
1019 <p>
1020 Generate a diff using the "patience diff" algorithm.
1021 </p>
1022 </dd>
1024 --histogram
1025 </dt>
1026 <dd>
1027 <p>
1028 Generate a diff using the "histogram diff" algorithm.
1029 </p>
1030 </dd>
1033 </dt>
1034 <dd>
1035 <p>
1036 Generate a diff using the "anchored diff" algorithm.
1037 </p>
1039 <div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
1040 and starts with this text, this algorithm attempts to prevent it from
1041 appearing as a deletion or addition in the output. It uses the "patience
1043 </dd>
1045 --diff-algorithm={patience|minimal|histogram|myers}
1046 </dt>
1047 <dd>
1048 <p>
1049 Choose a diff algorithm. The variants are as follows:
1050 </p>
1056 </dt>
1057 <dd>
1058 <p>
1059 The basic greedy diff algorithm. Currently, this is the default.
1060 </p>
1061 </dd>
1064 </dt>
1065 <dd>
1066 <p>
1067 Spend extra time to make sure the smallest possible diff is
1068 produced.
1069 </p>
1070 </dd>
1073 </dt>
1074 <dd>
1075 <p>
1076 Use "patience diff" algorithm when generating patches.
1077 </p>
1078 </dd>
1081 </dt>
1082 <dd>
1083 <p>
1084 This algorithm extends the patience algorithm to "support
1085 low-occurrence common elements".
1086 </p>
1087 </dd>
1088 </dl></div>
1089 </div></div>
1090 <div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
1091 non-default value and want to use the default one, then you
1093 </dd>
1096 </dt>
1097 <dd>
1098 <p>
1099 Generate a diffstat. By default, as much space as necessary
1100 will be used for the filename part, and the rest for the graph
1101 part. Maximum width defaults to terminal width, or 80 columns
1102 if not connected to a terminal, and can be overridden by
1113 </p>
1114 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
1115 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
1116 </dd>
1118 --compact-summary
1119 </dt>
1120 <dd>
1121 <p>
1122 Output a condensed summary of extended header information such
1125 or removing executable bit respectively) in diffstat. The
1126 information is put between the filename part and the graph
1128 </p>
1129 </dd>
1131 --numstat
1132 </dt>
1133 <dd>
1134 <p>
1136 deleted lines in decimal notation and pathname without
1137 abbreviation, to make it more machine friendly. For
1140 </p>
1141 </dd>
1143 --shortstat
1144 </dt>
1145 <dd>
1146 <p>
1148 number of modified files, as well as number of added and deleted
1149 lines.
1150 </p>
1151 </dd>
1154 </dt>
1157 </dt>
1158 <dd>
1159 <p>
1160 Output the distribution of relative amount of changes for each
1162 passing it a comma separated list of parameters.
1165 The following parameters are available:
1166 </p>
1172 </dt>
1173 <dd>
1174 <p>
1175 Compute the dirstat numbers by counting the lines that have been
1176 removed from the source, or added to the destination. This ignores
1177 the amount of pure code movements within a file. In other words,
1178 rearranging lines in a file is not counted as much as other changes.
1179 This is the default behavior when no parameter is given.
1180 </p>
1181 </dd>
1184 </dt>
1185 <dd>
1186 <p>
1187 Compute the dirstat numbers by doing the regular line-based diff
1188 analysis, and summing the removed/added line counts. (For binary
1189 files, count 64-byte chunks instead, since binary files have no
1192 lines within a file as much as other changes. The resulting output
1194 </p>
1195 </dd>
1198 </dt>
1199 <dd>
1200 <p>
1201 Compute the dirstat numbers by counting the number of files changed.
1202 Each changed file counts equally in the dirstat analysis. This is
1204 not have to look at the file contents at all.
1205 </p>
1206 </dd>
1209 </dt>
1210 <dd>
1211 <p>
1212 Count changes in a child directory for the parent directory as well.
1214 reported may exceed 100%. The default (non-cumulative) behavior can
1216 </p>
1217 </dd>
1220 </dt>
1221 <dd>
1222 <p>
1223 An integer parameter specifies a cut-off percent (3% by default).
1224 Directories contributing less than this percentage of the changes
1225 are not shown in the output.
1226 </p>
1227 </dd>
1228 </dl></div>
1229 </div></div>
1231 directories with less than 10% of the total amount of changed files,
1232 and accumulating child directory counts in the parent directories:
1234 </dd>
1236 --cumulative
1237 </dt>
1238 <dd>
1239 <p>
1240 Synonym for --dirstat=cumulative
1241 </p>
1242 </dd>
1245 </dt>
1246 <dd>
1247 <p>
1249 </p>
1250 </dd>
1252 --summary
1253 </dt>
1254 <dd>
1255 <p>
1256 Output a condensed summary of extended header information
1257 such as creations, renames and mode changes.
1258 </p>
1259 </dd>
1261 --patch-with-stat
1262 </dt>
1263 <dd>
1264 <p>
1266 </p>
1267 </dd>
1269 -z
1270 </dt>
1271 <dd>
1272 <p>
1273 When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
1274 given, do not munge pathnames and use NULs as output field terminators.
1275 </p>
1276 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1279 </dd>
1281 --name-only
1282 </dt>
1283 <dd>
1284 <p>
1285 Show only names of changed files. The file names are often encoded in UTF-8.
1286 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1287 manual page.
1288 </p>
1289 </dd>
1291 --name-status
1292 </dt>
1293 <dd>
1294 <p>
1295 Show only names and status of changed files. See the description
1298 </p>
1299 </dd>
1302 </dt>
1303 <dd>
1304 <p>
1305 Specify how differences in submodules are shown. When specifying
1307 shows the names of the commits at the beginning and end of the range.
1309 format is used. This format lists the commits in the range like
1310 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1312 inline diff of the changes in the submodule contents between the
1314 if the config option is unset.
1315 </p>
1316 </dd>
1319 </dt>
1320 <dd>
1321 <p>
1322 Show colored diff.
1323 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
1324 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
1326 configuration settings.
1327 </p>
1328 </dd>
1330 --no-color
1331 </dt>
1332 <dd>
1333 <p>
1334 Turn off colored diff.
1335 This can be used to override configuration settings.
1337 </p>
1338 </dd>
1341 </dt>
1342 <dd>
1343 <p>
1344 Moved lines of code are colored differently.
1348 The mode must be one of:
1349 </p>
1354 no
1355 </dt>
1356 <dd>
1357 <p>
1358 Moved lines are not highlighted.
1359 </p>
1360 </dd>
1362 default
1363 </dt>
1364 <dd>
1365 <p>
1367 in the future.
1368 </p>
1369 </dd>
1371 plain
1372 </dt>
1373 <dd>
1374 <p>
1375 Any line that is added in one location and was removed
1378 that are added somewhere else in the diff. This mode picks up any
1379 moved line, but it is not very useful in a review to determine
1380 if a block of code was moved without permutation.
1381 </p>
1382 </dd>
1384 blocks
1385 </dt>
1386 <dd>
1387 <p>
1388 Blocks of moved text of at least 20 alphanumeric characters
1389 are detected greedily. The detected blocks are
1391 Adjacent blocks cannot be told apart.
1392 </p>
1393 </dd>
1395 zebra
1396 </dt>
1397 <dd>
1398 <p>
1402 the two colors indicates that a new block was detected.
1403 </p>
1404 </dd>
1406 dimmed-zebra
1407 </dt>
1408 <dd>
1409 <p>
1411 of moved code is performed. The bordering lines of two adjacent
1412 blocks are considered interesting, the rest is uninteresting.
1414 </p>
1415 </dd>
1416 </dl></div>
1417 </div></div>
1418 </dd>
1420 --no-color-moved
1421 </dt>
1422 <dd>
1423 <p>
1424 Turn off move detection. This can be used to override configuration
1426 </p>
1427 </dd>
1430 </dt>
1431 <dd>
1432 <p>
1433 This configures how whitespace is ignored when performing the
1436 These modes can be given as a comma separated list:
1437 </p>
1442 no
1443 </dt>
1444 <dd>
1445 <p>
1446 Do not ignore whitespace when performing move detection.
1447 </p>
1448 </dd>
1450 ignore-space-at-eol
1451 </dt>
1452 <dd>
1453 <p>
1454 Ignore changes in whitespace at EOL.
1455 </p>
1456 </dd>
1458 ignore-space-change
1459 </dt>
1460 <dd>
1461 <p>
1462 Ignore changes in amount of whitespace. This ignores whitespace
1463 at line end, and considers all other sequences of one or
1464 more whitespace characters to be equivalent.
1465 </p>
1466 </dd>
1468 ignore-all-space
1469 </dt>
1470 <dd>
1471 <p>
1472 Ignore whitespace when comparing lines. This ignores differences
1473 even if one line has whitespace where the other line has none.
1474 </p>
1475 </dd>
1477 allow-indentation-change
1478 </dt>
1479 <dd>
1480 <p>
1481 Initially ignore any whitespace in the move detection, then
1482 group the moved code blocks only into a block if the change in
1483 whitespace is the same per line. This is incompatible with the
1484 other modes.
1485 </p>
1486 </dd>
1487 </dl></div>
1488 </div></div>
1489 </dd>
1491 --no-color-moved-ws
1492 </dt>
1493 <dd>
1494 <p>
1495 Do not ignore whitespace when performing move detection. This can be
1496 used to override configuration settings. It is the same as
1498 </p>
1499 </dd>
1502 </dt>
1503 <dd>
1504 <p>
1506 By default, words are delimited by whitespace; see
1508 must be one of:
1509 </p>
1514 color
1515 </dt>
1516 <dd>
1517 <p>
1519 </p>
1520 </dd>
1522 plain
1523 </dt>
1524 <dd>
1525 <p>
1527 attempts to escape the delimiters if they appear in the input,
1528 so the output may be ambiguous.
1529 </p>
1530 </dd>
1532 porcelain
1533 </dt>
1534 <dd>
1535 <p>
1536 Use a special line-based format intended for script
1537 consumption. Added/removed/unchanged runs are printed in the
1539 character at the beginning of the line and extending to the
1540 end of the line. Newlines in the input are represented by a
1542 </p>
1543 </dd>
1545 none
1546 </dt>
1547 <dd>
1548 <p>
1549 Disable word diff again.
1550 </p>
1551 </dd>
1552 </dl></div>
1553 </div></div>
1555 highlight the changed parts in all modes if enabled.</p></div>
1556 </dd>
1559 </dt>
1560 <dd>
1561 <p>
1563 runs of non-whitespace to be a word. Also implies
1565 </p>
1568 considered whitespace and ignored(!) for the purposes of finding
1570 expression to make sure that it matches all non-whitespace characters.
1571 A match that contains a newline is silently truncated(!) at the
1572 newline.</p></div>
1573 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1574 and, correspondingly, show differences character by character.</p></div>
1575 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1576 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
1577 overrides any diff driver or configuration setting. Diff drivers
1578 override configuration settings.</p></div>
1579 </dd>
1582 </dt>
1583 <dd>
1584 <p>
1587 </p>
1588 </dd>
1590 --no-renames
1591 </dt>
1592 <dd>
1593 <p>
1594 Turn off rename detection, even when the configuration
1595 file gives the default to do so.
1596 </p>
1597 </dd>
1599 --[no-]rename-empty
1600 </dt>
1601 <dd>
1602 <p>
1603 Whether to use empty blobs as rename source.
1604 </p>
1605 </dd>
1607 --check
1608 </dt>
1609 <dd>
1610 <p>
1611 Warn if changes introduce conflict markers or whitespace errors.
1613 configuration. By default, trailing whitespaces (including
1614 lines that consist solely of whitespaces) and a space character
1615 that is immediately followed by a tab character inside the
1616 initial indent of the line are considered whitespace errors.
1617 Exits with non-zero status if problems are found. Not compatible
1618 with --exit-code.
1619 </p>
1620 </dd>
1623 </dt>
1624 <dd>
1625 <p>
1627 lines of the diff. Multiple values are separated by comma,
1630 this option is not given, and the configuration variable
1634 </p>
1635 </dd>
1637 --full-index
1638 </dt>
1639 <dd>
1640 <p>
1641 Instead of the first handful of characters, show the full
1642 pre- and post-image blob object names on the "index"
1643 line when generating patch format output.
1644 </p>
1645 </dd>
1647 --binary
1648 </dt>
1649 <dd>
1650 <p>
1654 </p>
1655 </dd>
1658 </dt>
1659 <dd>
1660 <p>
1661 Instead of showing the full 40-byte hexadecimal object
1662 name in diff-raw format output and diff-tree header
1664 hexdigits long that uniquely refers the object.
1669 </p>
1670 </dd>
1673 </dt>
1676 </dt>
1677 <dd>
1678 <p>
1679 Break complete rewrite changes into pairs of delete and
1680 create. This serves two purposes:
1681 </p>
1682 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1683 not as a series of deletion and insertion mixed together with a very
1684 few lines that happen to match textually as the context, but as a
1685 single deletion of everything old followed by a single insertion of
1688 original should remain in the result for Git to consider it a total
1689 rewrite (i.e. otherwise the resulting patch will be a series of
1690 deletion and insertion mixed together with context lines).</p></div>
1691 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1692 source of a rename (usually -M only considers a file that disappeared
1696 eligible for being picked up as a possible source of a rename to
1697 another file.</p></div>
1698 </dd>
1701 </dt>
1704 </dt>
1705 <dd>
1706 <p>
1707 Detect renames.
1709 index (i.e. amount of addition/deletions compared to the
1711 delete/add pair to be a rename if more than 90% of the file
1717 </p>
1718 </dd>
1721 </dt>
1724 </dt>
1725 <dd>
1726 <p>
1729 </p>
1730 </dd>
1732 --find-copies-harder
1733 </dt>
1734 <dd>
1735 <p>
1737 if the original file of the copy was modified in the same
1738 changeset. This flag makes the command
1739 inspect unmodified files as candidates for the source of
1740 copy. This is a very expensive operation for large
1741 projects, so use it with caution. Giving more than one
1743 </p>
1744 </dd>
1746 -D
1747 </dt>
1749 --irreversible-delete
1750 </dt>
1751 <dd>
1752 <p>
1753 Omit the preimage for deletes, i.e. print only the header but not
1756 solely for people who want to just concentrate on reviewing the
1757 text after the change. In addition, the output obviously lacks
1758 enough information to apply such a patch in reverse, even manually,
1759 hence the name of the option.
1760 </p>
1761 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1762 of a delete/create pair.</p></div>
1763 </dd>
1766 </dt>
1767 <dd>
1768 <p>
1770 can detect subsets of renames/copies cheaply, followed by an
1771 exhaustive fallback portion that compares all remaining
1772 unpaired destinations to all relevant sources. (For renames,
1773 only remaining unpaired sources are relevant; for copies, all
1774 original sources are relevant.) For N sources and
1775 destinations, this exhaustive check is O(N^2). This option
1776 prevents the exhaustive portion of rename/copy detection from
1777 running if the number of source/destination files involved
1778 exceeds the specified number. Defaults to diff.renameLimit.
1779 Note that a value of 0 is treated as unlimited.
1780 </p>
1781 </dd>
1783 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1784 </dt>
1785 <dd>
1786 <p>
1792 Any combination of the filter characters (including none) can be used.
1794 paths are selected if there is any file that matches
1795 other criteria in the comparison; if there is no file
1796 that matches other criteria, nothing is selected.
1797 </p>
1800 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1801 renamed entries cannot appear if detection for those types is disabled.</p></div>
1802 </dd>
1805 </dt>
1806 <dd>
1807 <p>
1808 Look for differences that change the number of occurrences of
1809 the specified string (i.e. addition/deletion) in a file.
1810 Intended for the scripter’s use.
1811 </p>
1812 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
1813 struct), and want to know the history of that block since it first
1814 came into being: use the feature iteratively to feed the interesting
1816 very first version of the block.</p></div>
1818 </dd>
1821 </dt>
1822 <dd>
1823 <p>
1824 Look for differences whose patch text contains added/removed
1826 </p>
1827 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
1829 file:</p></div>
1833 ...
1835 </div></div>
1836 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1838 occurrences of that string did not change).</p></div>
1839 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1840 filter will be ignored.</p></div>
1841 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1842 information.</p></div>
1843 </dd>
1846 </dt>
1847 <dd>
1848 <p>
1849 Look for differences that change the number of occurrences of
1851 in that it doesn’t search for a specific string but for a specific
1852 object id.
1853 </p>
1854 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1856 </dd>
1858 --pickaxe-all
1859 </dt>
1860 <dd>
1861 <p>
1863 changeset, not just the files that contain the change
1865 </p>
1866 </dd>
1868 --pickaxe-regex
1869 </dt>
1870 <dd>
1871 <p>
1873 expression to match.
1874 </p>
1875 </dd>
1878 </dt>
1879 <dd>
1880 <p>
1881 Control the order in which files appear in the output.
1885 </p>
1888 All files with pathnames that match the first pattern are output
1889 first, all files with pathnames that match the second pattern (but not
1890 the first) are output next, and so on.
1891 All files with pathnames that do not match any pattern are output
1892 last, as if there was an implicit match-all pattern at the end of the
1893 file.
1894 If multiple pathnames have the same rank (they match the same pattern
1895 but no earlier patterns), their output order relative to each other is
1896 the normal order.</p></div>
1901 <li>
1902 <p>
1903 Blank lines are ignored, so they can be used as separators for
1904 readability.
1905 </p>
1906 </li>
1907 <li>
1908 <p>
1909 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1910 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1911 pattern if it starts with a hash.
1912 </p>
1913 </li>
1914 <li>
1915 <p>
1916 Each other line contains a single pattern.
1917 </p>
1918 </li>
1919 </ul></div>
1920 </div></div>
1922 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1923 matches a pattern if removing any number of the final pathname
1924 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1925 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
1926 </dd>
1929 </dt>
1932 </dt>
1933 <dd>
1934 <p>
1939 otherwise.
1940 </p>
1941 </dd>
1943 -R
1944 </dt>
1945 <dd>
1946 <p>
1947 Swap two inputs; that is, show differences from index or
1948 on-disk file to tree contents.
1949 </p>
1950 </dd>
1953 </dt>
1955 --no-relative
1956 </dt>
1957 <dd>
1958 <p>
1959 When run from a subdirectory of the project, it can be
1960 told to exclude changes outside the directory and show
1961 pathnames relative to it with this option. When you are
1962 not in a subdirectory (e.g. in a bare repository), you
1963 can name which subdirectory to make the output relative
1967 </p>
1968 </dd>
1970 -a
1971 </dt>
1973 --text
1974 </dt>
1975 <dd>
1976 <p>
1977 Treat all files as text.
1978 </p>
1979 </dd>
1981 --ignore-cr-at-eol
1982 </dt>
1983 <dd>
1984 <p>
1985 Ignore carriage-return at the end of line when doing a comparison.
1986 </p>
1987 </dd>
1989 --ignore-space-at-eol
1990 </dt>
1991 <dd>
1992 <p>
1993 Ignore changes in whitespace at EOL.
1994 </p>
1995 </dd>
1997 -b
1998 </dt>
2000 --ignore-space-change
2001 </dt>
2002 <dd>
2003 <p>
2004 Ignore changes in amount of whitespace. This ignores whitespace
2005 at line end, and considers all other sequences of one or
2006 more whitespace characters to be equivalent.
2007 </p>
2008 </dd>
2010 -w
2011 </dt>
2013 --ignore-all-space
2014 </dt>
2015 <dd>
2016 <p>
2017 Ignore whitespace when comparing lines. This ignores
2018 differences even if one line has whitespace where the other
2019 line has none.
2020 </p>
2021 </dd>
2023 --ignore-blank-lines
2024 </dt>
2025 <dd>
2026 <p>
2027 Ignore changes whose lines are all blank.
2028 </p>
2029 </dd>
2032 </dt>
2035 </dt>
2036 <dd>
2037 <p>
2039 be specified more than once.
2040 </p>
2041 </dd>
2044 </dt>
2045 <dd>
2046 <p>
2047 Show the context between diff hunks, up to the specified number
2048 of lines, thereby fusing hunks that are close to each other.
2050 is unset.
2051 </p>
2052 </dd>
2054 -W
2055 </dt>
2057 --function-context
2058 </dt>
2059 <dd>
2060 <p>
2061 Show whole function as context lines for each change.
2062 The function names are determined in the same way as
2065 </p>
2066 </dd>
2068 --exit-code
2069 </dt>
2070 <dd>
2071 <p>
2072 Make the program exit with codes similar to diff(1).
2073 That is, it exits with 1 if there were differences and
2074 0 means no differences.
2075 </p>
2076 </dd>
2078 --quiet
2079 </dt>
2080 <dd>
2081 <p>
2083 </p>
2084 </dd>
2086 --ext-diff
2087 </dt>
2088 <dd>
2089 <p>
2090 Allow an external diff helper to be executed. If you set an
2093 </p>
2094 </dd>
2096 --no-ext-diff
2097 </dt>
2098 <dd>
2099 <p>
2100 Disallow external diff drivers.
2101 </p>
2102 </dd>
2104 --textconv
2105 </dt>
2107 --no-textconv
2108 </dt>
2109 <dd>
2110 <p>
2111 Allow (or disallow) external text conversion filters to be run
2113 details. Because textconv filters are typically a one-way
2114 conversion, the resulting diff is suitable for human
2115 consumption, but cannot be applied. For this reason, textconv
2117 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
2118 diff plumbing commands.
2119 </p>
2120 </dd>
2123 </dt>
2124 <dd>
2125 <p>
2128 Using "none" will consider the submodule modified when it either contains
2129 untracked or modified files or its HEAD differs from the commit recorded
2130 in the superproject and can be used to override any settings of the
2131 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2132 "untracked" is used submodules are not considered dirty when they only
2133 contain untracked content (but they are still scanned for modified
2134 content). Using "dirty" ignores all changes to the work tree of submodules,
2135 only changes to the commits stored in the superproject are shown (this was
2137 </p>
2138 </dd>
2141 </dt>
2142 <dd>
2143 <p>
2144 Show the given source prefix instead of "a/".
2145 </p>
2146 </dd>
2149 </dt>
2150 <dd>
2151 <p>
2152 Show the given destination prefix instead of "b/".
2153 </p>
2154 </dd>
2156 --no-prefix
2157 </dt>
2158 <dd>
2159 <p>
2160 Do not show any source or destination prefix.
2161 </p>
2162 </dd>
2164 --default-prefix
2165 </dt>
2166 <dd>
2167 <p>
2172 </p>
2173 </dd>
2176 </dt>
2177 <dd>
2178 <p>
2179 Prepend an additional prefix to every line of output.
2180 </p>
2181 </dd>
2183 --ita-invisible-in-index
2184 </dt>
2185 <dd>
2186 <p>
2187 By default entries added by "git add -N" appear as an existing
2189 This option makes the entry appear as a new file in "git diff"
2190 and non-existent in "git diff --cached". This option could be
2192 experimental and could be removed in future.
2193 </p>
2194 </dd>
2195 </dl></div>
2200 -1 --base
2201 </dt>
2203 -2 --ours
2204 </dt>
2206 -3 --theirs
2207 </dt>
2208 <dd>
2209 <p>
2212 index contains these stages only for unmerged entries i.e.
2214 section "3-Way Merge" for detailed information.
2215 </p>
2216 </dd>
2218 -0
2219 </dt>
2220 <dd>
2221 <p>
2222 Omit diff output for unmerged entries and just show
2223 "Unmerged". Can be used only when comparing the working tree
2224 with the index.
2225 </p>
2226 </dd>
2229 </dt>
2230 <dd>
2231 <p>
2233 the diff to the named paths (you can give directory
2234 names and get diff for all files under them).
2235 </p>
2236 </dd>
2237 </dl></div>
2238 </div>
2239 </div>
2246 compared differs:</p></div>
2250 </dt>
2251 <dd>
2252 <p>
2254 </p>
2255 </dd>
2258 </dt>
2259 <dd>
2260 <p>
2262 </p>
2263 </dd>
2266 </dt>
2267 <dd>
2268 <p>
2269 compares the trees named by the two arguments.
2270 </p>
2271 </dd>
2274 </dt>
2275 <dd>
2276 <p>
2277 compares the index and the files on the filesystem.
2278 </p>
2279 </dd>
2280 </dl></div>
2281 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
2282 what is being compared. After that, all the commands print one output
2283 line per changed file.</p></div>
2290 create :000000 100644 0000000 1234567 A file4
2291 delete :100644 000000 1234567 0000000 D file5
2293 </div></div>
2296 <li>
2297 <p>
2298 a colon.
2299 </p>
2300 </li>
2301 <li>
2302 <p>
2304 </p>
2305 </li>
2306 <li>
2307 <p>
2308 a space.
2309 </p>
2310 </li>
2311 <li>
2312 <p>
2314 </p>
2315 </li>
2316 <li>
2317 <p>
2318 a space.
2319 </p>
2320 </li>
2321 <li>
2322 <p>
2324 </p>
2325 </li>
2326 <li>
2327 <p>
2328 a space.
2329 </p>
2330 </li>
2331 <li>
2332 <p>
2334 </p>
2335 </li>
2336 <li>
2337 <p>
2338 a space.
2339 </p>
2340 </li>
2341 <li>
2342 <p>
2343 status, followed by optional "score" number.
2344 </p>
2345 </li>
2346 <li>
2347 <p>
2349 </p>
2350 </li>
2351 <li>
2352 <p>
2353 path for "src"
2354 </p>
2355 </li>
2356 <li>
2357 <p>
2359 </p>
2360 </li>
2361 <li>
2362 <p>
2363 path for "dst"; only exists for C or R.
2364 </p>
2365 </li>
2366 <li>
2367 <p>
2369 </p>
2370 </li>
2371 </ol></div>
2374 <li>
2375 <p>
2376 A: addition of a file
2377 </p>
2378 </li>
2379 <li>
2380 <p>
2381 C: copy of a file into a new one
2382 </p>
2383 </li>
2384 <li>
2385 <p>
2386 D: deletion of a file
2387 </p>
2388 </li>
2389 <li>
2390 <p>
2391 M: modification of the contents or mode of a file
2392 </p>
2393 </li>
2394 <li>
2395 <p>
2396 R: renaming of a file
2397 </p>
2398 </li>
2399 <li>
2400 <p>
2401 T: change in the type of the file (regular file, symbolic link or submodule)
2402 </p>
2403 </li>
2404 <li>
2405 <p>
2406 U: file is unmerged (you must complete the merge before it can
2407 be committed)
2408 </p>
2409 </li>
2410 <li>
2411 <p>
2412 X: "unknown" change type (most probably a bug, please report it)
2413 </p>
2414 </li>
2415 </ul></div>
2417 percentage of similarity between the source and target of the move or
2418 copy). Status letter M may be followed by a score (denoting the
2419 percentage of dissimilarity) for file rewrites.</p></div>
2420 <div class="paragraph"><p>The sha1 for "dst" is shown as all 0’s if a file on the filesystem
2421 is out of sync with the index.</p></div>
2426 </div></div>
2427 <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2429 (see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2430 verbatim and the line is terminated by a NUL byte.</p></div>
2431 </div>
2432 </div>
2438 to generate diff output also for merge commits. The output differs
2439 from the format described above in the following way:</p></div>
2441 <li>
2442 <p>
2443 there is a colon for each parent
2444 </p>
2445 </li>
2446 <li>
2447 <p>
2449 </p>
2450 </li>
2451 <li>
2452 <p>
2453 status is concatenated status characters for each parent
2454 </p>
2455 </li>
2456 <li>
2457 <p>
2458 no optional "score" number
2459 </p>
2460 </li>
2461 <li>
2462 <p>
2463 tab-separated pathname(s) of the file
2464 </p>
2465 </li>
2466 </ol></div>
2467 <div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2468 if the file was renamed on any side of history. With
2470 followed by the name of the path in the merge commit.</p></div>
2471 <div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
2477 </div></div>
2478 <div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2484 </div></div>
2485 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2486 all parents.</p></div>
2487 </div>
2488 </div>
2500 You can customize the creation of patch text via the
2502 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
2503 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2504 diff format:</p></div>
2506 <li>
2507 <p>
2508 It is preceded by a "git diff" header that looks like this:
2509 </p>
2513 </div></div>
2514 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
2515 involved. Especially, even for a creation or a deletion,
2516 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2517 <div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
2518 name of the source file of the rename/copy and the name of
2519 the file that the rename/copy produces, respectively.</p></div>
2520 </li>
2521 <li>
2522 <p>
2523 It is followed by one or more extended header lines:
2524 </p>
2538 </div></div>
2539 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2540 and file permission bits.</p></div>
2541 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
2543 the dissimilarity index is the percentage of changed lines. It
2544 is a rounded down integer, followed by a percent sign. The
2545 similarity index value of 100% is thus reserved for two equal
2546 files, while 100% dissimilarity means that no line from the old
2547 file made it into the new one.</p></div>
2548 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
2550 separate lines indicate the old and the new mode.</p></div>
2551 </li>
2552 <li>
2553 <p>
2554 Pathnames with "unusual" characters are quoted as explained for
2557 </p>
2558 </li>
2559 <li>
2560 <p>
2563 It is incorrect to apply each change to each file sequentially. For
2564 example, this patch will swap a and b:
2565 </p>
2568 <pre><code>diff --git a/a b/b
2569 rename from a
2570 rename to b
2571 diff --git a/b b/a
2572 rename from b
2573 rename to a</code></pre>
2574 </div></div>
2575 </li>
2576 <li>
2577 <p>
2578 Hunk headers mention the name of the function to which the hunk
2579 applies. See "Defining a custom hunk-header" in
2581 specific languages.
2582 </p>
2583 </li>
2584 </ol></div>
2585 </div>
2586 </div>
2590 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
2595 diffs in a specific format.</p></div>
2599 <pre><code>diff --combined describe.c
2600 index fabadb8,cc95eb0..4866510
2601 --- a/describe.c
2602 +++ b/describe.c
2605 }
2607 - static void describe(char *arg)
2608 -static void describe(struct commit *cmit, int last_one)
2609 ++static void describe(char *arg, int last_one)
2610 {
2611 + unsigned char sha1[20];
2612 + struct commit *cmit;
2613 struct commit_list *list;
2614 static int initialized = 0;
2615 struct commit_name *n;
2618 + usage(describe_usage);
2619 + cmit = lookup_commit_reference(sha1);
2620 + if (!cmit)
2621 + usage(describe_usage);
2622 +
2623 if (!initialized) {
2624 initialized = 1;
2625 for_each_ref(get_name);</code></pre>
2626 </div></div>
2628 <li>
2629 <p>
2630 It is preceded by a "git diff" header, that looks like
2632 </p>
2636 </div></div>
2641 </div></div>
2642 </li>
2643 <li>
2644 <p>
2645 It is followed by one or more extended header lines
2646 (this example shows a merge with two parents):
2647 </p>
2654 </div></div>
2655 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
2657 information about detected content movement (renames and
2658 copying detection) are designed to work with the diff of two
2660 </li>
2661 <li>
2662 <p>
2663 It is followed by a two-line from-file/to-file header:
2664 </p>
2667 <pre><code>--- a/file
2668 +++ b/file</code></pre>
2669 </div></div>
2670 <div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
2672 files.</p></div>
2673 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2674 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
2675 where N is the number of parents in the merge commit:</p></div>
2678 <pre><code>--- a/file
2679 --- a/file
2680 --- a/file
2681 +++ b/file</code></pre>
2682 </div></div>
2684 active, to allow you to see the original name of the file in different
2685 parents.</p></div>
2686 </li>
2687 <li>
2688 <p>
2689 Chunk header format is modified to prevent people from
2691 was created for review of merge commit changes, and was not
2692 meant to be applied. The change is similar to the change in the
2694 </p>
2697 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
2698 </div></div>
2699 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
2700 header for combined diff format.</p></div>
2701 </li>
2702 </ol></div>
2704 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
2706 compares two or more files file1, file2,… with one file X, and
2707 shows how X differs from each of fileN. One column for each of
2708 fileN is prepended to the output line to note how X’s line is
2709 different from it.</p></div>
2710 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2712 in the column N means that the line appears in the result,
2713 and fileN does not have that line (in other words, the line was
2714 added, from the point of view of that parent).</p></div>
2718 in either file1 or file2). Also, eight other lines are the same
2720 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
2721 merge commit with the merge result (i.e. file1..fileN are the
2723 two unresolved merge parents with the working tree file
2726 </div>
2727 </div>
2731 <div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2733 output. These options can be combined with other options, such as
2735 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
2736 formats the pathnames compactly by combining common prefix and suffix of
2742 </div></div>
2743 <div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2745 like this:</p></div>
2750 </div></div>
2753 <li>
2754 <p>
2755 the number of added lines;
2756 </p>
2757 </li>
2758 <li>
2759 <p>
2760 a tab;
2761 </p>
2762 </li>
2763 <li>
2764 <p>
2765 the number of deleted lines;
2766 </p>
2767 </li>
2768 <li>
2769 <p>
2770 a tab;
2771 </p>
2772 </li>
2773 <li>
2774 <p>
2775 pathname (possibly with rename/copy information);
2776 </p>
2777 </li>
2778 <li>
2779 <p>
2780 a newline.
2781 </p>
2782 </li>
2783 </ol></div>
2784 <div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
2789 </div></div>
2792 <li>
2793 <p>
2794 the number of added lines;
2795 </p>
2796 </li>
2797 <li>
2798 <p>
2799 a tab;
2800 </p>
2801 </li>
2802 <li>
2803 <p>
2804 the number of deleted lines;
2805 </p>
2806 </li>
2807 <li>
2808 <p>
2809 a tab;
2810 </p>
2811 </li>
2812 <li>
2813 <p>
2814 a NUL (only exists if renamed/copied);
2815 </p>
2816 </li>
2817 <li>
2818 <p>
2819 pathname in preimage;
2820 </p>
2821 </li>
2822 <li>
2823 <p>
2824 a NUL (only exists if renamed/copied);
2825 </p>
2826 </li>
2827 <li>
2828 <p>
2829 pathname in postimage (only exists if renamed/copied);
2830 </p>
2831 </li>
2832 <li>
2833 <p>
2834 a NUL.
2835 </p>
2836 </li>
2837 </ol></div>
2838 <div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
2839 scripts that read the output to tell if the current record being read is
2840 a single-path record or a rename/copy record without reading ahead.
2843 </div>
2844 </div>
2850 Various ways to check your working tree
2851 </dt>
2852 <dd>
2859 </div></div>
2861 <li>
2862 <p>
2863 Changes in the working tree not yet staged for the next commit.
2864 </p>
2865 </li>
2866 <li>
2867 <p>
2868 Changes between the index and your last commit; what you
2870 </p>
2871 </li>
2872 <li>
2873 <p>
2874 Changes in the working tree since your last commit; what you
2876 </p>
2877 </li>
2878 <li>
2879 <p>
2880 Changes in the working tree you’ve made to resolve textual
2881 conflicts so far.
2882 </p>
2883 </li>
2884 </ol></div>
2885 </dd>
2887 Comparing with arbitrary commits
2888 </dt>
2889 <dd>
2895 </div></div>
2897 <li>
2898 <p>
2899 Instead of using the tip of the current branch, compare with the
2900 tip of "test" branch.
2901 </p>
2902 </li>
2903 <li>
2904 <p>
2905 Instead of comparing with the tip of "test" branch, compare with
2906 the tip of the current branch, but limit the comparison to the
2907 file "test".
2908 </p>
2909 </li>
2910 <li>
2911 <p>
2912 Compare the version before the last commit and the last commit.
2913 </p>
2914 </li>
2915 </ol></div>
2916 </dd>
2918 Comparing branches
2919 </dt>
2920 <dd>
2926 </div></div>
2928 <li>
2929 <p>
2930 Changes between the tips of the topic and the master branches.
2931 </p>
2932 </li>
2933 <li>
2934 <p>
2935 Same as above.
2936 </p>
2937 </li>
2938 <li>
2939 <p>
2940 Changes that occurred on the master branch since when the topic
2941 branch was started off it.
2942 </p>
2943 </li>
2944 </ol></div>
2945 </dd>
2947 Limiting the diff output
2948 </dt>
2949 <dd>
2955 </div></div>
2957 <li>
2958 <p>
2959 Show only modification, rename, and copy, but not addition
2960 or deletion.
2961 </p>
2962 </li>
2963 <li>
2964 <p>
2965 Show only names and the nature of change, but not actual
2966 diff output.
2967 </p>
2968 </li>
2969 <li>
2970 <p>
2971 Limit diff output to named subtrees.
2972 </p>
2973 </li>
2974 </ol></div>
2975 </dd>
2977 Munging the diff output
2978 </dt>
2979 <dd>
2984 </div></div>
2986 <li>
2987 <p>
2988 Spend extra cycles to find renames, copies and complete
2989 rewrites (very expensive).
2990 </p>
2991 </li>
2992 <li>
2993 <p>
2994 Output diff in reverse.
2995 </p>
2996 </li>
2997 </ol></div>
2998 </dd>
2999 </dl></div>
3000 </div>
3001 </div>
3010 diff.autoRefreshIndex
3011 </dt>
3012 <dd>
3013 <p>
3015 files, do not consider stat-only changes as changed.
3017 update the cached stat information for paths whose
3018 contents in the work tree match the contents in the
3019 index. This option defaults to true. Note that this
3022 </p>
3023 </dd>
3025 diff.dirstat
3026 </dt>
3027 <dd>
3028 <p>
3030 default behavior of the <code>--dirstat</code> option to <a href="git-diff.html">git-diff(1)</a>
3031 and friends. The defaults can be overridden on the command line
3034 The following parameters are available:
3035 </p>
3041 </dt>
3042 <dd>
3043 <p>
3044 Compute the dirstat numbers by counting the lines that have been
3045 removed from the source, or added to the destination. This ignores
3046 the amount of pure code movements within a file. In other words,
3047 rearranging lines in a file is not counted as much as other changes.
3048 This is the default behavior when no parameter is given.
3049 </p>
3050 </dd>
3053 </dt>
3054 <dd>
3055 <p>
3056 Compute the dirstat numbers by doing the regular line-based diff
3057 analysis, and summing the removed/added line counts. (For binary
3058 files, count 64-byte chunks instead, since binary files have no
3061 lines within a file as much as other changes. The resulting output
3063 </p>
3064 </dd>
3067 </dt>
3068 <dd>
3069 <p>
3070 Compute the dirstat numbers by counting the number of files changed.
3071 Each changed file counts equally in the dirstat analysis. This is
3073 not have to look at the file contents at all.
3074 </p>
3075 </dd>
3078 </dt>
3079 <dd>
3080 <p>
3081 Count changes in a child directory for the parent directory as well.
3083 reported may exceed 100%. The default (non-cumulative) behavior can
3085 </p>
3086 </dd>
3089 </dt>
3090 <dd>
3091 <p>
3092 An integer parameter specifies a cut-off percent (3% by default).
3093 Directories contributing less than this percentage of the changes
3094 are not shown in the output.
3095 </p>
3096 </dd>
3097 </dl></div>
3098 </div></div>
3100 directories with less than 10% of the total amount of changed files,
3101 and accumulating child directory counts in the parent directories:
3103 </dd>
3105 diff.statNameWidth
3106 </dt>
3107 <dd>
3108 <p>
3109 Limit the width of the filename part in --stat output. If set, applies
3110 to all commands generating --stat output except format-patch.
3111 </p>
3112 </dd>
3114 diff.statGraphWidth
3115 </dt>
3116 <dd>
3117 <p>
3118 Limit the width of the graph part in --stat output. If set, applies
3119 to all commands generating --stat output except format-patch.
3120 </p>
3121 </dd>
3123 diff.context
3124 </dt>
3125 <dd>
3126 <p>
3128 of 3. This value is overridden by the -U option.
3129 </p>
3130 </dd>
3132 diff.interHunkContext
3133 </dt>
3134 <dd>
3135 <p>
3136 Show the context between diff hunks, up to the specified number
3137 of lines, thereby fusing the hunks that are close to each other.
3139 command line option.
3140 </p>
3141 </dd>
3143 diff.external
3144 </dt>
3145 <dd>
3146 <p>
3147 If this config variable is set, diff generation is not
3148 performed using the internal diff machinery, but using the
3150 environment variable. The command is called with parameters
3152 you want to use an external diff program only on a subset of
3154 </p>
3155 </dd>
3157 diff.ignoreSubmodules
3158 </dt>
3159 <dd>
3160 <p>
3161 Sets the default value of --ignore-submodules. Note that this
3165 this setting when reporting uncommitted changes. Setting it to
3168 overridden by using the --ignore-submodules command-line option.
3170 By default this is set to untracked so that any untracked
3171 submodules are ignored.
3172 </p>
3173 </dd>
3175 diff.mnemonicPrefix
3176 </dt>
3177 <dd>
3178 <p>
3181 this configuration is in effect, reverse diff output also swaps
3182 the order of the prefixes:
3183 </p>
3187 </dt>
3188 <dd>
3189 <p>
3190 compares the (i)ndex and the (w)ork tree;
3191 </p>
3192 </dd>
3195 </dt>
3196 <dd>
3197 <p>
3198 compares a (c)ommit and the (w)ork tree;
3199 </p>
3200 </dd>
3203 </dt>
3204 <dd>
3205 <p>
3206 compares a (c)ommit and the (i)ndex;
3207 </p>
3208 </dd>
3211 </dt>
3212 <dd>
3213 <p>
3214 compares an (o)bject and a (w)ork tree entity;
3215 </p>
3216 </dd>
3219 </dt>
3220 <dd>
3221 <p>
3223 </p>
3224 </dd>
3225 </dl></div>
3226 </dd>
3228 diff.noPrefix
3229 </dt>
3230 <dd>
3231 <p>
3233 </p>
3234 </dd>
3236 diff.srcPrefix
3237 </dt>
3238 <dd>
3239 <p>
3241 </p>
3242 </dd>
3244 diff.dstPrefix
3245 </dt>
3246 <dd>
3247 <p>
3249 </p>
3250 </dd>
3252 diff.relative
3253 </dt>
3254 <dd>
3255 <p>
3257 and show pathnames relative to the current directory.
3258 </p>
3259 </dd>
3261 diff.orderFile
3262 </dt>
3263 <dd>
3264 <p>
3265 File indicating how to order files within a diff.
3268 relative to the top of the working tree.
3269 </p>
3270 </dd>
3272 diff.renameLimit
3273 </dt>
3274 <dd>
3275 <p>
3276 The number of files to consider in the exhaustive portion of
3279 setting has no effect if rename detection is turned off.
3280 </p>
3281 </dd>
3283 diff.renames
3284 </dt>
3285 <dd>
3286 <p>
3287 Whether and how Git detects renames. If set to "false",
3288 rename detection is disabled. If set to "true", basic rename
3290 detect copies, as well. Defaults to true. Note that this
3294 </p>
3295 </dd>
3297 diff.suppressBlankEmpty
3298 </dt>
3299 <dd>
3300 <p>
3301 A boolean to inhibit the standard behavior of printing a space
3302 before each empty output line. Defaults to false.
3303 </p>
3304 </dd>
3306 diff.submodule
3307 </dt>
3308 <dd>
3309 <p>
3310 Specify the format in which differences in submodules are
3311 shown. The "short" format just shows the names of the commits
3312 at the beginning and end of the range. The "log" format lists
3313 the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code>
3314 does. The "diff" format shows an inline diff of the changed
3315 contents of the submodule. Defaults to "short".
3316 </p>
3317 </dd>
3319 diff.wordRegex
3320 </dt>
3321 <dd>
3322 <p>
3323 A POSIX Extended Regular Expression used to determine what is a "word"
3324 when performing word-by-word difference calculations. Character
3325 sequences that match the regular expression are "words", all other
3327 </p>
3328 </dd>
3331 </dt>
3332 <dd>
3333 <p>
3335 for details.
3336 </p>
3337 </dd>
3340 </dt>
3341 <dd>
3342 <p>
3343 The regular expression that the diff driver should use to
3344 recognize the hunk header. A built-in pattern may also be used.
3346 </p>
3347 </dd>
3350 </dt>
3351 <dd>
3352 <p>
3353 Set this option to true to make the diff driver treat files as
3355 </p>
3356 </dd>
3359 </dt>
3360 <dd>
3361 <p>
3362 The command that the diff driver should call to generate the
3363 text-converted version of a file. The result of the
3364 conversion is used to generate a human-readable diff. See
3366 </p>
3367 </dd>
3370 </dt>
3371 <dd>
3372 <p>
3373 The regular expression that the diff driver should use to
3375 details.
3376 </p>
3377 </dd>
3380 </dt>
3381 <dd>
3382 <p>
3383 Set this option to true to make the diff driver cache the text
3385 </p>
3389 </dt>
3390 <dd>
3391 <p>
3392 Use Araxis Merge (requires a graphical session)
3393 </p>
3394 </dd>
3397 </dt>
3398 <dd>
3399 <p>
3400 Use Beyond Compare (requires a graphical session)
3401 </p>
3402 </dd>
3405 </dt>
3406 <dd>
3407 <p>
3408 Use Beyond Compare (requires a graphical session)
3409 </p>
3410 </dd>
3413 </dt>
3414 <dd>
3415 <p>
3416 Use Beyond Compare (requires a graphical session)
3417 </p>
3418 </dd>
3421 </dt>
3422 <dd>
3423 <p>
3424 Use Code Compare (requires a graphical session)
3425 </p>
3426 </dd>
3429 </dt>
3430 <dd>
3431 <p>
3432 Use DeltaWalker (requires a graphical session)
3433 </p>
3434 </dd>
3437 </dt>
3438 <dd>
3439 <p>
3440 Use DiffMerge (requires a graphical session)
3441 </p>
3442 </dd>
3445 </dt>
3446 <dd>
3447 <p>
3448 Use Diffuse (requires a graphical session)
3449 </p>
3450 </dd>
3453 </dt>
3454 <dd>
3455 <p>
3456 Use ECMerge (requires a graphical session)
3457 </p>
3458 </dd>
3461 </dt>
3462 <dd>
3463 <p>
3464 Use Emacs' Emerge
3465 </p>
3466 </dd>
3469 </dt>
3470 <dd>
3471 <p>
3472 Use ExamDiff Pro (requires a graphical session)
3473 </p>
3474 </dd>
3477 </dt>
3478 <dd>
3479 <p>
3480 Use Guiffy’s Diff Tool (requires a graphical session)
3481 </p>
3482 </dd>
3485 </dt>
3486 <dd>
3487 <p>
3488 Use gVim (requires a graphical session)
3489 </p>
3490 </dd>
3493 </dt>
3494 <dd>
3495 <p>
3496 Use KDiff3 (requires a graphical session)
3497 </p>
3498 </dd>
3501 </dt>
3502 <dd>
3503 <p>
3504 Use Kompare (requires a graphical session)
3505 </p>
3506 </dd>
3509 </dt>
3510 <dd>
3511 <p>
3512 Use Meld (requires a graphical session)
3513 </p>
3514 </dd>
3517 </dt>
3518 <dd>
3519 <p>
3520 Use Neovim
3521 </p>
3522 </dd>
3525 </dt>
3526 <dd>
3527 <p>
3528 Use FileMerge (requires a graphical session)
3529 </p>
3530 </dd>
3533 </dt>
3534 <dd>
3535 <p>
3536 Use HelixCore P4Merge (requires a graphical session)
3537 </p>
3538 </dd>
3541 </dt>
3542 <dd>
3543 <p>
3544 Use Sublime Merge (requires a graphical session)
3545 </p>
3546 </dd>
3549 </dt>
3550 <dd>
3551 <p>
3552 Use TkDiff (requires a graphical session)
3553 </p>
3554 </dd>
3557 </dt>
3558 <dd>
3559 <p>
3560 Use Vim
3561 </p>
3562 </dd>
3565 </dt>
3566 <dd>
3567 <p>
3568 Use WinMerge (requires a graphical session)
3569 </p>
3570 </dd>
3573 </dt>
3574 <dd>
3575 <p>
3576 Use xxdiff (requires a graphical session)
3577 </p>
3578 </dd>
3579 </dl></div>
3580 </dd>
3582 diff.indentHeuristic
3583 </dt>
3584 <dd>
3585 <p>
3587 that shift diff hunk boundaries to make patches easier to read.
3588 </p>
3589 </dd>
3591 diff.algorithm
3592 </dt>
3593 <dd>
3594 <p>
3595 Choose a diff algorithm. The variants are as follows:
3596 </p>
3602 </dt>
3603 <dd>
3604 <p>
3605 The basic greedy diff algorithm. Currently, this is the default.
3606 </p>
3607 </dd>
3610 </dt>
3611 <dd>
3612 <p>
3613 Spend extra time to make sure the smallest possible diff is
3614 produced.
3615 </p>
3616 </dd>
3619 </dt>
3620 <dd>
3621 <p>
3622 Use "patience diff" algorithm when generating patches.
3623 </p>
3624 </dd>
3627 </dt>
3628 <dd>
3629 <p>
3630 This algorithm extends the patience algorithm to "support
3631 low-occurrence common elements".
3632 </p>
3633 </dd>
3634 </dl></div>
3635 </div></div>
3636 </dd>
3638 diff.wsErrorHighlight
3639 </dt>
3640 <dd>
3641 <p>
3643 lines of the diff. Multiple values are separated by comma,
3648 overrides this setting.
3649 </p>
3650 </dd>
3652 diff.colorMoved
3653 </dt>
3654 <dd>
3655 <p>
3657 in a diff are colored differently, for details of valid modes
3659 true the default color mode will be used. When set to false,
3660 moved lines are not colored.
3661 </p>
3662 </dd>
3664 diff.colorMovedWS
3665 </dt>
3666 <dd>
3667 <p>
3670 For details of valid modes see <em>--color-moved-ws</em> in <a href="git-diff.html">git-diff(1)</a>.
3671 </p>
3672 </dd>
3673 </dl></div>
3674 </div>
3675 </div>
3686 </div>
3687 </div>
3692 </div>
3693 </div>
3694 </div>
3698 Last updated
3700 </div>
3701 </div>
3702 </body>
3703 </html>