| blob | 9b747eb58999c76fbcc204866fcd9ccf4ec95730 |
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
1105 of the graph part can be limited by using
1111 there are more.
1112 </p>
1113 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
1114 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
1115 </dd>
1117 --compact-summary
1118 </dt>
1119 <dd>
1120 <p>
1121 Output a condensed summary of extended header information such
1124 or removing executable bit respectively) in diffstat. The
1125 information is put between the filename part and the graph
1127 </p>
1128 </dd>
1130 --numstat
1131 </dt>
1132 <dd>
1133 <p>
1135 deleted lines in decimal notation and pathname without
1136 abbreviation, to make it more machine friendly. For
1139 </p>
1140 </dd>
1142 --shortstat
1143 </dt>
1144 <dd>
1145 <p>
1147 number of modified files, as well as number of added and deleted
1148 lines.
1149 </p>
1150 </dd>
1153 </dt>
1156 </dt>
1157 <dd>
1158 <p>
1159 Output the distribution of relative amount of changes for each
1161 passing it a comma separated list of parameters.
1164 The following parameters are available:
1165 </p>
1171 </dt>
1172 <dd>
1173 <p>
1174 Compute the dirstat numbers by counting the lines that have been
1175 removed from the source, or added to the destination. This ignores
1176 the amount of pure code movements within a file. In other words,
1177 rearranging lines in a file is not counted as much as other changes.
1178 This is the default behavior when no parameter is given.
1179 </p>
1180 </dd>
1183 </dt>
1184 <dd>
1185 <p>
1186 Compute the dirstat numbers by doing the regular line-based diff
1187 analysis, and summing the removed/added line counts. (For binary
1188 files, count 64-byte chunks instead, since binary files have no
1191 lines within a file as much as other changes. The resulting output
1193 </p>
1194 </dd>
1197 </dt>
1198 <dd>
1199 <p>
1200 Compute the dirstat numbers by counting the number of files changed.
1201 Each changed file counts equally in the dirstat analysis. This is
1203 not have to look at the file contents at all.
1204 </p>
1205 </dd>
1208 </dt>
1209 <dd>
1210 <p>
1211 Count changes in a child directory for the parent directory as well.
1213 reported may exceed 100%. The default (non-cumulative) behavior can
1215 </p>
1216 </dd>
1219 </dt>
1220 <dd>
1221 <p>
1222 An integer parameter specifies a cut-off percent (3% by default).
1223 Directories contributing less than this percentage of the changes
1224 are not shown in the output.
1225 </p>
1226 </dd>
1227 </dl></div>
1228 </div></div>
1230 directories with less than 10% of the total amount of changed files,
1231 and accumulating child directory counts in the parent directories:
1233 </dd>
1235 --cumulative
1236 </dt>
1237 <dd>
1238 <p>
1239 Synonym for --dirstat=cumulative
1240 </p>
1241 </dd>
1244 </dt>
1245 <dd>
1246 <p>
1247 Synonym for --dirstat=files,param1,param2…
1248 </p>
1249 </dd>
1251 --summary
1252 </dt>
1253 <dd>
1254 <p>
1255 Output a condensed summary of extended header information
1256 such as creations, renames and mode changes.
1257 </p>
1258 </dd>
1260 --patch-with-stat
1261 </dt>
1262 <dd>
1263 <p>
1265 </p>
1266 </dd>
1268 -z
1269 </dt>
1270 <dd>
1271 <p>
1272 When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
1273 given, do not munge pathnames and use NULs as output field terminators.
1274 </p>
1275 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1278 </dd>
1280 --name-only
1281 </dt>
1282 <dd>
1283 <p>
1284 Show only names of changed files. The file names are often encoded in UTF-8.
1285 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1286 manual page.
1287 </p>
1288 </dd>
1290 --name-status
1291 </dt>
1292 <dd>
1293 <p>
1294 Show only names and status of changed files. See the description
1297 </p>
1298 </dd>
1301 </dt>
1302 <dd>
1303 <p>
1304 Specify how differences in submodules are shown. When specifying
1306 shows the names of the commits at the beginning and end of the range.
1308 format is used. This format lists the commits in the range like
1309 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1311 inline diff of the changes in the submodule contents between the
1313 if the config option is unset.
1314 </p>
1315 </dd>
1318 </dt>
1319 <dd>
1320 <p>
1321 Show colored diff.
1322 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
1323 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
1325 configuration settings.
1326 </p>
1327 </dd>
1329 --no-color
1330 </dt>
1331 <dd>
1332 <p>
1333 Turn off colored diff.
1334 This can be used to override configuration settings.
1336 </p>
1337 </dd>
1340 </dt>
1341 <dd>
1342 <p>
1343 Moved lines of code are colored differently.
1347 The mode must be one of:
1348 </p>
1353 no
1354 </dt>
1355 <dd>
1356 <p>
1357 Moved lines are not highlighted.
1358 </p>
1359 </dd>
1361 default
1362 </dt>
1363 <dd>
1364 <p>
1366 in the future.
1367 </p>
1368 </dd>
1370 plain
1371 </dt>
1372 <dd>
1373 <p>
1374 Any line that is added in one location and was removed
1377 that are added somewhere else in the diff. This mode picks up any
1378 moved line, but it is not very useful in a review to determine
1379 if a block of code was moved without permutation.
1380 </p>
1381 </dd>
1383 blocks
1384 </dt>
1385 <dd>
1386 <p>
1387 Blocks of moved text of at least 20 alphanumeric characters
1388 are detected greedily. The detected blocks are
1390 Adjacent blocks cannot be told apart.
1391 </p>
1392 </dd>
1394 zebra
1395 </dt>
1396 <dd>
1397 <p>
1401 the two colors indicates that a new block was detected.
1402 </p>
1403 </dd>
1405 dimmed-zebra
1406 </dt>
1407 <dd>
1408 <p>
1410 of moved code is performed. The bordering lines of two adjacent
1411 blocks are considered interesting, the rest is uninteresting.
1413 </p>
1414 </dd>
1415 </dl></div>
1416 </div></div>
1417 </dd>
1419 --no-color-moved
1420 </dt>
1421 <dd>
1422 <p>
1423 Turn off move detection. This can be used to override configuration
1425 </p>
1426 </dd>
1429 </dt>
1430 <dd>
1431 <p>
1432 This configures how whitespace is ignored when performing the
1435 These modes can be given as a comma separated list:
1436 </p>
1441 no
1442 </dt>
1443 <dd>
1444 <p>
1445 Do not ignore whitespace when performing move detection.
1446 </p>
1447 </dd>
1449 ignore-space-at-eol
1450 </dt>
1451 <dd>
1452 <p>
1453 Ignore changes in whitespace at EOL.
1454 </p>
1455 </dd>
1457 ignore-space-change
1458 </dt>
1459 <dd>
1460 <p>
1461 Ignore changes in amount of whitespace. This ignores whitespace
1462 at line end, and considers all other sequences of one or
1463 more whitespace characters to be equivalent.
1464 </p>
1465 </dd>
1467 ignore-all-space
1468 </dt>
1469 <dd>
1470 <p>
1471 Ignore whitespace when comparing lines. This ignores differences
1472 even if one line has whitespace where the other line has none.
1473 </p>
1474 </dd>
1476 allow-indentation-change
1477 </dt>
1478 <dd>
1479 <p>
1480 Initially ignore any whitespace in the move detection, then
1481 group the moved code blocks only into a block if the change in
1482 whitespace is the same per line. This is incompatible with the
1483 other modes.
1484 </p>
1485 </dd>
1486 </dl></div>
1487 </div></div>
1488 </dd>
1490 --no-color-moved-ws
1491 </dt>
1492 <dd>
1493 <p>
1494 Do not ignore whitespace when performing move detection. This can be
1495 used to override configuration settings. It is the same as
1497 </p>
1498 </dd>
1501 </dt>
1502 <dd>
1503 <p>
1505 By default, words are delimited by whitespace; see
1507 must be one of:
1508 </p>
1513 color
1514 </dt>
1515 <dd>
1516 <p>
1518 </p>
1519 </dd>
1521 plain
1522 </dt>
1523 <dd>
1524 <p>
1526 attempts to escape the delimiters if they appear in the input,
1527 so the output may be ambiguous.
1528 </p>
1529 </dd>
1531 porcelain
1532 </dt>
1533 <dd>
1534 <p>
1535 Use a special line-based format intended for script
1536 consumption. Added/removed/unchanged runs are printed in the
1538 character at the beginning of the line and extending to the
1539 end of the line. Newlines in the input are represented by a
1541 </p>
1542 </dd>
1544 none
1545 </dt>
1546 <dd>
1547 <p>
1548 Disable word diff again.
1549 </p>
1550 </dd>
1551 </dl></div>
1552 </div></div>
1554 highlight the changed parts in all modes if enabled.</p></div>
1555 </dd>
1558 </dt>
1559 <dd>
1560 <p>
1562 runs of non-whitespace to be a word. Also implies
1564 </p>
1567 considered whitespace and ignored(!) for the purposes of finding
1569 expression to make sure that it matches all non-whitespace characters.
1570 A match that contains a newline is silently truncated(!) at the
1571 newline.</p></div>
1572 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1573 and, correspondingly, show differences character by character.</p></div>
1574 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1575 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
1576 overrides any diff driver or configuration setting. Diff drivers
1577 override configuration settings.</p></div>
1578 </dd>
1581 </dt>
1582 <dd>
1583 <p>
1586 </p>
1587 </dd>
1589 --no-renames
1590 </dt>
1591 <dd>
1592 <p>
1593 Turn off rename detection, even when the configuration
1594 file gives the default to do so.
1595 </p>
1596 </dd>
1598 --[no-]rename-empty
1599 </dt>
1600 <dd>
1601 <p>
1602 Whether to use empty blobs as rename source.
1603 </p>
1604 </dd>
1606 --check
1607 </dt>
1608 <dd>
1609 <p>
1610 Warn if changes introduce conflict markers or whitespace errors.
1612 configuration. By default, trailing whitespaces (including
1613 lines that consist solely of whitespaces) and a space character
1614 that is immediately followed by a tab character inside the
1615 initial indent of the line are considered whitespace errors.
1616 Exits with non-zero status if problems are found. Not compatible
1617 with --exit-code.
1618 </p>
1619 </dd>
1622 </dt>
1623 <dd>
1624 <p>
1626 lines of the diff. Multiple values are separated by comma,
1629 this option is not given, and the configuration variable
1633 </p>
1634 </dd>
1636 --full-index
1637 </dt>
1638 <dd>
1639 <p>
1640 Instead of the first handful of characters, show the full
1641 pre- and post-image blob object names on the "index"
1642 line when generating patch format output.
1643 </p>
1644 </dd>
1646 --binary
1647 </dt>
1648 <dd>
1649 <p>
1653 </p>
1654 </dd>
1657 </dt>
1658 <dd>
1659 <p>
1660 Instead of showing the full 40-byte hexadecimal object
1661 name in diff-raw format output and diff-tree header
1663 hexdigits long that uniquely refers the object.
1668 </p>
1669 </dd>
1672 </dt>
1675 </dt>
1676 <dd>
1677 <p>
1678 Break complete rewrite changes into pairs of delete and
1679 create. This serves two purposes:
1680 </p>
1681 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1682 not as a series of deletion and insertion mixed together with a very
1683 few lines that happen to match textually as the context, but as a
1684 single deletion of everything old followed by a single insertion of
1687 original should remain in the result for Git to consider it a total
1688 rewrite (i.e. otherwise the resulting patch will be a series of
1689 deletion and insertion mixed together with context lines).</p></div>
1690 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1691 source of a rename (usually -M only considers a file that disappeared
1695 eligible for being picked up as a possible source of a rename to
1696 another file.</p></div>
1697 </dd>
1700 </dt>
1703 </dt>
1704 <dd>
1705 <p>
1706 Detect renames.
1708 index (i.e. amount of addition/deletions compared to the
1710 delete/add pair to be a rename if more than 90% of the file
1716 </p>
1717 </dd>
1720 </dt>
1723 </dt>
1724 <dd>
1725 <p>
1728 </p>
1729 </dd>
1731 --find-copies-harder
1732 </dt>
1733 <dd>
1734 <p>
1736 if the original file of the copy was modified in the same
1737 changeset. This flag makes the command
1738 inspect unmodified files as candidates for the source of
1739 copy. This is a very expensive operation for large
1740 projects, so use it with caution. Giving more than one
1742 </p>
1743 </dd>
1745 -D
1746 </dt>
1748 --irreversible-delete
1749 </dt>
1750 <dd>
1751 <p>
1752 Omit the preimage for deletes, i.e. print only the header but not
1755 solely for people who want to just concentrate on reviewing the
1756 text after the change. In addition, the output obviously lacks
1757 enough information to apply such a patch in reverse, even manually,
1758 hence the name of the option.
1759 </p>
1760 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1761 of a delete/create pair.</p></div>
1762 </dd>
1765 </dt>
1766 <dd>
1767 <p>
1769 can detect subsets of renames/copies cheaply, followed by an
1770 exhaustive fallback portion that compares all remaining
1771 unpaired destinations to all relevant sources. (For renames,
1772 only remaining unpaired sources are relevant; for copies, all
1773 original sources are relevant.) For N sources and
1774 destinations, this exhaustive check is O(N^2). This option
1775 prevents the exhaustive portion of rename/copy detection from
1776 running if the number of source/destination files involved
1777 exceeds the specified number. Defaults to diff.renameLimit.
1778 Note that a value of 0 is treated as unlimited.
1779 </p>
1780 </dd>
1782 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1783 </dt>
1784 <dd>
1785 <p>
1791 Any combination of the filter characters (including none) can be used.
1793 paths are selected if there is any file that matches
1794 other criteria in the comparison; if there is no file
1795 that matches other criteria, nothing is selected.
1796 </p>
1799 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1800 renamed entries cannot appear if detection for those types is disabled.</p></div>
1801 </dd>
1804 </dt>
1805 <dd>
1806 <p>
1807 Look for differences that change the number of occurrences of
1808 the specified string (i.e. addition/deletion) in a file.
1809 Intended for the scripter’s use.
1810 </p>
1811 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
1812 struct), and want to know the history of that block since it first
1813 came into being: use the feature iteratively to feed the interesting
1815 very first version of the block.</p></div>
1817 </dd>
1820 </dt>
1821 <dd>
1822 <p>
1823 Look for differences whose patch text contains added/removed
1825 </p>
1826 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
1828 file:</p></div>
1832 ...
1834 </div></div>
1835 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1837 occurrences of that string did not change).</p></div>
1838 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1839 filter will be ignored.</p></div>
1840 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1841 information.</p></div>
1842 </dd>
1845 </dt>
1846 <dd>
1847 <p>
1848 Look for differences that change the number of occurrences of
1850 in that it doesn’t search for a specific string but for a specific
1851 object id.
1852 </p>
1853 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1855 </dd>
1857 --pickaxe-all
1858 </dt>
1859 <dd>
1860 <p>
1862 changeset, not just the files that contain the change
1864 </p>
1865 </dd>
1867 --pickaxe-regex
1868 </dt>
1869 <dd>
1870 <p>
1872 expression to match.
1873 </p>
1874 </dd>
1877 </dt>
1878 <dd>
1879 <p>
1880 Control the order in which files appear in the output.
1884 </p>
1887 All files with pathnames that match the first pattern are output
1888 first, all files with pathnames that match the second pattern (but not
1889 the first) are output next, and so on.
1890 All files with pathnames that do not match any pattern are output
1891 last, as if there was an implicit match-all pattern at the end of the
1892 file.
1893 If multiple pathnames have the same rank (they match the same pattern
1894 but no earlier patterns), their output order relative to each other is
1895 the normal order.</p></div>
1900 <li>
1901 <p>
1902 Blank lines are ignored, so they can be used as separators for
1903 readability.
1904 </p>
1905 </li>
1906 <li>
1907 <p>
1908 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1909 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1910 pattern if it starts with a hash.
1911 </p>
1912 </li>
1913 <li>
1914 <p>
1915 Each other line contains a single pattern.
1916 </p>
1917 </li>
1918 </ul></div>
1919 </div></div>
1921 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1922 matches a pattern if removing any number of the final pathname
1923 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1924 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
1925 </dd>
1928 </dt>
1931 </dt>
1932 <dd>
1933 <p>
1938 otherwise.
1939 </p>
1940 </dd>
1942 -R
1943 </dt>
1944 <dd>
1945 <p>
1946 Swap two inputs; that is, show differences from index or
1947 on-disk file to tree contents.
1948 </p>
1949 </dd>
1952 </dt>
1954 --no-relative
1955 </dt>
1956 <dd>
1957 <p>
1958 When run from a subdirectory of the project, it can be
1959 told to exclude changes outside the directory and show
1960 pathnames relative to it with this option. When you are
1961 not in a subdirectory (e.g. in a bare repository), you
1962 can name which subdirectory to make the output relative
1966 </p>
1967 </dd>
1969 -a
1970 </dt>
1972 --text
1973 </dt>
1974 <dd>
1975 <p>
1976 Treat all files as text.
1977 </p>
1978 </dd>
1980 --ignore-cr-at-eol
1981 </dt>
1982 <dd>
1983 <p>
1984 Ignore carriage-return at the end of line when doing a comparison.
1985 </p>
1986 </dd>
1988 --ignore-space-at-eol
1989 </dt>
1990 <dd>
1991 <p>
1992 Ignore changes in whitespace at EOL.
1993 </p>
1994 </dd>
1996 -b
1997 </dt>
1999 --ignore-space-change
2000 </dt>
2001 <dd>
2002 <p>
2003 Ignore changes in amount of whitespace. This ignores whitespace
2004 at line end, and considers all other sequences of one or
2005 more whitespace characters to be equivalent.
2006 </p>
2007 </dd>
2009 -w
2010 </dt>
2012 --ignore-all-space
2013 </dt>
2014 <dd>
2015 <p>
2016 Ignore whitespace when comparing lines. This ignores
2017 differences even if one line has whitespace where the other
2018 line has none.
2019 </p>
2020 </dd>
2022 --ignore-blank-lines
2023 </dt>
2024 <dd>
2025 <p>
2026 Ignore changes whose lines are all blank.
2027 </p>
2028 </dd>
2031 </dt>
2034 </dt>
2035 <dd>
2036 <p>
2038 be specified more than once.
2039 </p>
2040 </dd>
2043 </dt>
2044 <dd>
2045 <p>
2046 Show the context between diff hunks, up to the specified number
2047 of lines, thereby fusing hunks that are close to each other.
2049 is unset.
2050 </p>
2051 </dd>
2053 -W
2054 </dt>
2056 --function-context
2057 </dt>
2058 <dd>
2059 <p>
2060 Show whole function as context lines for each change.
2061 The function names are determined in the same way as
2064 </p>
2065 </dd>
2067 --exit-code
2068 </dt>
2069 <dd>
2070 <p>
2071 Make the program exit with codes similar to diff(1).
2072 That is, it exits with 1 if there were differences and
2073 0 means no differences.
2074 </p>
2075 </dd>
2077 --quiet
2078 </dt>
2079 <dd>
2080 <p>
2082 </p>
2083 </dd>
2085 --ext-diff
2086 </dt>
2087 <dd>
2088 <p>
2089 Allow an external diff helper to be executed. If you set an
2092 </p>
2093 </dd>
2095 --no-ext-diff
2096 </dt>
2097 <dd>
2098 <p>
2099 Disallow external diff drivers.
2100 </p>
2101 </dd>
2103 --textconv
2104 </dt>
2106 --no-textconv
2107 </dt>
2108 <dd>
2109 <p>
2110 Allow (or disallow) external text conversion filters to be run
2112 details. Because textconv filters are typically a one-way
2113 conversion, the resulting diff is suitable for human
2114 consumption, but cannot be applied. For this reason, textconv
2116 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
2117 diff plumbing commands.
2118 </p>
2119 </dd>
2122 </dt>
2123 <dd>
2124 <p>
2127 Using "none" will consider the submodule modified when it either contains
2128 untracked or modified files or its HEAD differs from the commit recorded
2129 in the superproject and can be used to override any settings of the
2130 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2131 "untracked" is used submodules are not considered dirty when they only
2132 contain untracked content (but they are still scanned for modified
2133 content). Using "dirty" ignores all changes to the work tree of submodules,
2134 only changes to the commits stored in the superproject are shown (this was
2136 </p>
2137 </dd>
2140 </dt>
2141 <dd>
2142 <p>
2143 Show the given source prefix instead of "a/".
2144 </p>
2145 </dd>
2148 </dt>
2149 <dd>
2150 <p>
2151 Show the given destination prefix instead of "b/".
2152 </p>
2153 </dd>
2155 --no-prefix
2156 </dt>
2157 <dd>
2158 <p>
2159 Do not show any source or destination prefix.
2160 </p>
2161 </dd>
2163 --default-prefix
2164 </dt>
2165 <dd>
2166 <p>
2168 This is usually the default already, but may be used to override
2170 </p>
2171 </dd>
2174 </dt>
2175 <dd>
2176 <p>
2177 Prepend an additional prefix to every line of output.
2178 </p>
2179 </dd>
2181 --ita-invisible-in-index
2182 </dt>
2183 <dd>
2184 <p>
2185 By default entries added by "git add -N" appear as an existing
2187 This option makes the entry appear as a new file in "git diff"
2188 and non-existent in "git diff --cached". This option could be
2190 experimental and could be removed in future.
2191 </p>
2192 </dd>
2193 </dl></div>
2198 -1 --base
2199 </dt>
2201 -2 --ours
2202 </dt>
2204 -3 --theirs
2205 </dt>
2206 <dd>
2207 <p>
2210 index contains these stages only for unmerged entries i.e.
2212 section "3-Way Merge" for detailed information.
2213 </p>
2214 </dd>
2216 -0
2217 </dt>
2218 <dd>
2219 <p>
2220 Omit diff output for unmerged entries and just show
2221 "Unmerged". Can be used only when comparing the working tree
2222 with the index.
2223 </p>
2224 </dd>
2227 </dt>
2228 <dd>
2229 <p>
2231 the diff to the named paths (you can give directory
2232 names and get diff for all files under them).
2233 </p>
2234 </dd>
2235 </dl></div>
2236 </div>
2237 </div>
2244 compared differs:</p></div>
2248 </dt>
2249 <dd>
2250 <p>
2252 </p>
2253 </dd>
2256 </dt>
2257 <dd>
2258 <p>
2260 </p>
2261 </dd>
2264 </dt>
2265 <dd>
2266 <p>
2267 compares the trees named by the two arguments.
2268 </p>
2269 </dd>
2272 </dt>
2273 <dd>
2274 <p>
2275 compares the index and the files on the filesystem.
2276 </p>
2277 </dd>
2278 </dl></div>
2279 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
2280 what is being compared. After that, all the commands print one output
2281 line per changed file.</p></div>
2288 create :000000 100644 0000000 1234567 A file4
2289 delete :100644 000000 1234567 0000000 D file5
2291 </div></div>
2294 <li>
2295 <p>
2296 a colon.
2297 </p>
2298 </li>
2299 <li>
2300 <p>
2302 </p>
2303 </li>
2304 <li>
2305 <p>
2306 a space.
2307 </p>
2308 </li>
2309 <li>
2310 <p>
2312 </p>
2313 </li>
2314 <li>
2315 <p>
2316 a space.
2317 </p>
2318 </li>
2319 <li>
2320 <p>
2322 </p>
2323 </li>
2324 <li>
2325 <p>
2326 a space.
2327 </p>
2328 </li>
2329 <li>
2330 <p>
2332 </p>
2333 </li>
2334 <li>
2335 <p>
2336 a space.
2337 </p>
2338 </li>
2339 <li>
2340 <p>
2341 status, followed by optional "score" number.
2342 </p>
2343 </li>
2344 <li>
2345 <p>
2347 </p>
2348 </li>
2349 <li>
2350 <p>
2351 path for "src"
2352 </p>
2353 </li>
2354 <li>
2355 <p>
2357 </p>
2358 </li>
2359 <li>
2360 <p>
2361 path for "dst"; only exists for C or R.
2362 </p>
2363 </li>
2364 <li>
2365 <p>
2367 </p>
2368 </li>
2369 </ol></div>
2372 <li>
2373 <p>
2374 A: addition of a file
2375 </p>
2376 </li>
2377 <li>
2378 <p>
2379 C: copy of a file into a new one
2380 </p>
2381 </li>
2382 <li>
2383 <p>
2384 D: deletion of a file
2385 </p>
2386 </li>
2387 <li>
2388 <p>
2389 M: modification of the contents or mode of a file
2390 </p>
2391 </li>
2392 <li>
2393 <p>
2394 R: renaming of a file
2395 </p>
2396 </li>
2397 <li>
2398 <p>
2399 T: change in the type of the file (regular file, symbolic link or submodule)
2400 </p>
2401 </li>
2402 <li>
2403 <p>
2404 U: file is unmerged (you must complete the merge before it can
2405 be committed)
2406 </p>
2407 </li>
2408 <li>
2409 <p>
2410 X: "unknown" change type (most probably a bug, please report it)
2411 </p>
2412 </li>
2413 </ul></div>
2415 percentage of similarity between the source and target of the move or
2416 copy). Status letter M may be followed by a score (denoting the
2417 percentage of dissimilarity) for file rewrites.</p></div>
2418 <div class="paragraph"><p>The sha1 for "dst" is shown as all 0’s if a file on the filesystem
2419 is out of sync with the index.</p></div>
2424 </div></div>
2425 <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2427 (see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2428 verbatim and the line is terminated by a NUL byte.</p></div>
2429 </div>
2430 </div>
2436 to generate diff output also for merge commits. The output differs
2437 from the format described above in the following way:</p></div>
2439 <li>
2440 <p>
2441 there is a colon for each parent
2442 </p>
2443 </li>
2444 <li>
2445 <p>
2447 </p>
2448 </li>
2449 <li>
2450 <p>
2451 status is concatenated status characters for each parent
2452 </p>
2453 </li>
2454 <li>
2455 <p>
2456 no optional "score" number
2457 </p>
2458 </li>
2459 <li>
2460 <p>
2461 tab-separated pathname(s) of the file
2462 </p>
2463 </li>
2464 </ol></div>
2465 <div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2466 if the file was renamed on any side of history. With
2468 followed by the name of the path in the merge commit.</p></div>
2469 <div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
2475 </div></div>
2476 <div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2482 </div></div>
2483 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2484 all parents.</p></div>
2485 </div>
2486 </div>
2498 You can customize the creation of patch text via the
2500 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
2501 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2502 diff format:</p></div>
2504 <li>
2505 <p>
2506 It is preceded with a "git diff" header that looks like this:
2507 </p>
2511 </div></div>
2512 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
2513 involved. Especially, even for a creation or a deletion,
2514 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2515 <div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
2516 name of the source file of the rename/copy and the name of
2517 the file that rename/copy produces, respectively.</p></div>
2518 </li>
2519 <li>
2520 <p>
2521 It is followed by one or more extended header lines:
2522 </p>
2536 </div></div>
2537 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2538 and file permission bits.</p></div>
2539 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
2541 the dissimilarity index is the percentage of changed lines. It
2542 is a rounded down integer, followed by a percent sign. The
2543 similarity index value of 100% is thus reserved for two equal
2544 files, while 100% dissimilarity means that no line from the old
2545 file made it into the new one.</p></div>
2546 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
2548 separate lines indicate the old and the new mode.</p></div>
2549 </li>
2550 <li>
2551 <p>
2552 Pathnames with "unusual" characters are quoted as explained for
2555 </p>
2556 </li>
2557 <li>
2558 <p>
2561 It is incorrect to apply each change to each file sequentially. For
2562 example, this patch will swap a and b:
2563 </p>
2566 <pre><code>diff --git a/a b/b
2567 rename from a
2568 rename to b
2569 diff --git a/b b/a
2570 rename from b
2571 rename to a</code></pre>
2572 </div></div>
2573 </li>
2574 <li>
2575 <p>
2576 Hunk headers mention the name of the function to which the hunk
2577 applies. See "Defining a custom hunk-header" in
2579 specific languages.
2580 </p>
2581 </li>
2582 </ol></div>
2583 </div>
2584 </div>
2588 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
2593 diffs in specific format.</p></div>
2597 <pre><code>diff --combined describe.c
2598 index fabadb8,cc95eb0..4866510
2599 --- a/describe.c
2600 +++ b/describe.c
2603 }
2605 - static void describe(char *arg)
2606 -static void describe(struct commit *cmit, int last_one)
2607 ++static void describe(char *arg, int last_one)
2608 {
2609 + unsigned char sha1[20];
2610 + struct commit *cmit;
2611 struct commit_list *list;
2612 static int initialized = 0;
2613 struct commit_name *n;
2616 + usage(describe_usage);
2617 + cmit = lookup_commit_reference(sha1);
2618 + if (!cmit)
2619 + usage(describe_usage);
2620 +
2621 if (!initialized) {
2622 initialized = 1;
2623 for_each_ref(get_name);</code></pre>
2624 </div></div>
2626 <li>
2627 <p>
2628 It is preceded with a "git diff" header, that looks like
2630 </p>
2634 </div></div>
2639 </div></div>
2640 </li>
2641 <li>
2642 <p>
2643 It is followed by one or more extended header lines
2644 (this example shows a merge with two parents):
2645 </p>
2652 </div></div>
2653 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
2655 information about detected contents movement (renames and
2656 copying detection) are designed to work with diff of two
2658 </li>
2659 <li>
2660 <p>
2661 It is followed by two-line from-file/to-file header
2662 </p>
2665 <pre><code>--- a/file
2666 +++ b/file</code></pre>
2667 </div></div>
2670 files.</p></div>
2671 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2672 two-line from-file/to-file you get a N+1 line from-file/to-file header,
2673 where N is the number of parents in the merge commit</p></div>
2676 <pre><code>--- a/file
2677 --- a/file
2678 --- a/file
2679 +++ b/file</code></pre>
2680 </div></div>
2682 active, to allow you to see the original name of the file in different
2683 parents.</p></div>
2684 </li>
2685 <li>
2686 <p>
2687 Chunk header format is modified to prevent people from
2689 was created for review of merge commit changes, and was not
2690 meant to be applied. The change is similar to the change in the
2692 </p>
2695 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
2696 </div></div>
2697 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
2698 header for combined diff format.</p></div>
2699 </li>
2700 </ol></div>
2702 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
2704 compares two or more files file1, file2,… with one file X, and
2705 shows how X differs from each of fileN. One column for each of
2706 fileN is prepended to the output line to note how X’s line is
2707 different from it.</p></div>
2708 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2710 in the column N means that the line appears in the result,
2711 and fileN does not have that line (in other words, the line was
2712 added, from the point of view of that parent).</p></div>
2716 in either file1 or file2). Also eight other lines are the same
2718 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
2719 merge commit with the merge result (i.e. file1..fileN are the
2721 two unresolved merge parents with the working tree file
2724 </div>
2725 </div>
2729 <div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2731 output. These options can be combined with other options, such as
2733 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
2734 formats the pathnames compactly by combining common prefix and suffix of
2740 </div></div>
2741 <div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2743 like this:</p></div>
2748 </div></div>
2751 <li>
2752 <p>
2753 the number of added lines;
2754 </p>
2755 </li>
2756 <li>
2757 <p>
2758 a tab;
2759 </p>
2760 </li>
2761 <li>
2762 <p>
2763 the number of deleted lines;
2764 </p>
2765 </li>
2766 <li>
2767 <p>
2768 a tab;
2769 </p>
2770 </li>
2771 <li>
2772 <p>
2773 pathname (possibly with rename/copy information);
2774 </p>
2775 </li>
2776 <li>
2777 <p>
2778 a newline.
2779 </p>
2780 </li>
2781 </ol></div>
2782 <div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
2787 </div></div>
2790 <li>
2791 <p>
2792 the number of added lines;
2793 </p>
2794 </li>
2795 <li>
2796 <p>
2797 a tab;
2798 </p>
2799 </li>
2800 <li>
2801 <p>
2802 the number of deleted lines;
2803 </p>
2804 </li>
2805 <li>
2806 <p>
2807 a tab;
2808 </p>
2809 </li>
2810 <li>
2811 <p>
2812 a NUL (only exists if renamed/copied);
2813 </p>
2814 </li>
2815 <li>
2816 <p>
2817 pathname in preimage;
2818 </p>
2819 </li>
2820 <li>
2821 <p>
2822 a NUL (only exists if renamed/copied);
2823 </p>
2824 </li>
2825 <li>
2826 <p>
2827 pathname in postimage (only exists if renamed/copied);
2828 </p>
2829 </li>
2830 <li>
2831 <p>
2832 a NUL.
2833 </p>
2834 </li>
2835 </ol></div>
2836 <div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
2837 scripts that read the output to tell if the current record being read is
2838 a single-path record or a rename/copy record without reading ahead.
2841 </div>
2842 </div>
2848 Various ways to check your working tree
2849 </dt>
2850 <dd>
2857 </div></div>
2859 <li>
2860 <p>
2861 Changes in the working tree not yet staged for the next commit.
2862 </p>
2863 </li>
2864 <li>
2865 <p>
2866 Changes between the index and your last commit; what you
2868 </p>
2869 </li>
2870 <li>
2871 <p>
2872 Changes in the working tree since your last commit; what you
2874 </p>
2875 </li>
2876 <li>
2877 <p>
2878 Changes in the working tree you’ve made to resolve textual
2879 conflicts so far.
2880 </p>
2881 </li>
2882 </ol></div>
2883 </dd>
2885 Comparing with arbitrary commits
2886 </dt>
2887 <dd>
2893 </div></div>
2895 <li>
2896 <p>
2897 Instead of using the tip of the current branch, compare with the
2898 tip of "test" branch.
2899 </p>
2900 </li>
2901 <li>
2902 <p>
2903 Instead of comparing with the tip of "test" branch, compare with
2904 the tip of the current branch, but limit the comparison to the
2905 file "test".
2906 </p>
2907 </li>
2908 <li>
2909 <p>
2910 Compare the version before the last commit and the last commit.
2911 </p>
2912 </li>
2913 </ol></div>
2914 </dd>
2916 Comparing branches
2917 </dt>
2918 <dd>
2924 </div></div>
2926 <li>
2927 <p>
2928 Changes between the tips of the topic and the master branches.
2929 </p>
2930 </li>
2931 <li>
2932 <p>
2933 Same as above.
2934 </p>
2935 </li>
2936 <li>
2937 <p>
2938 Changes that occurred on the master branch since when the topic
2939 branch was started off it.
2940 </p>
2941 </li>
2942 </ol></div>
2943 </dd>
2945 Limiting the diff output
2946 </dt>
2947 <dd>
2953 </div></div>
2955 <li>
2956 <p>
2957 Show only modification, rename, and copy, but not addition
2958 or deletion.
2959 </p>
2960 </li>
2961 <li>
2962 <p>
2963 Show only names and the nature of change, but not actual
2964 diff output.
2965 </p>
2966 </li>
2967 <li>
2968 <p>
2969 Limit diff output to named subtrees.
2970 </p>
2971 </li>
2972 </ol></div>
2973 </dd>
2975 Munging the diff output
2976 </dt>
2977 <dd>
2982 </div></div>
2984 <li>
2985 <p>
2986 Spend extra cycles to find renames, copies and complete
2987 rewrites (very expensive).
2988 </p>
2989 </li>
2990 <li>
2991 <p>
2992 Output diff in reverse.
2993 </p>
2994 </li>
2995 </ol></div>
2996 </dd>
2997 </dl></div>
2998 </div>
2999 </div>
3008 diff.autoRefreshIndex
3009 </dt>
3010 <dd>
3011 <p>
3013 files, do not consider stat-only change as changed.
3015 update the cached stat information for paths whose
3016 contents in the work tree match the contents in the
3017 index. This option defaults to true. Note that this
3020 </p>
3021 </dd>
3023 diff.dirstat
3024 </dt>
3025 <dd>
3026 <p>
3028 default behavior of the <code>--dirstat</code> option to <a href="git-diff.html">git-diff(1)</a>
3029 and friends. The defaults can be overridden on the command line
3032 The following parameters are available:
3033 </p>
3039 </dt>
3040 <dd>
3041 <p>
3042 Compute the dirstat numbers by counting the lines that have been
3043 removed from the source, or added to the destination. This ignores
3044 the amount of pure code movements within a file. In other words,
3045 rearranging lines in a file is not counted as much as other changes.
3046 This is the default behavior when no parameter is given.
3047 </p>
3048 </dd>
3051 </dt>
3052 <dd>
3053 <p>
3054 Compute the dirstat numbers by doing the regular line-based diff
3055 analysis, and summing the removed/added line counts. (For binary
3056 files, count 64-byte chunks instead, since binary files have no
3059 lines within a file as much as other changes. The resulting output
3061 </p>
3062 </dd>
3065 </dt>
3066 <dd>
3067 <p>
3068 Compute the dirstat numbers by counting the number of files changed.
3069 Each changed file counts equally in the dirstat analysis. This is
3071 not have to look at the file contents at all.
3072 </p>
3073 </dd>
3076 </dt>
3077 <dd>
3078 <p>
3079 Count changes in a child directory for the parent directory as well.
3081 reported may exceed 100%. The default (non-cumulative) behavior can
3083 </p>
3084 </dd>
3087 </dt>
3088 <dd>
3089 <p>
3090 An integer parameter specifies a cut-off percent (3% by default).
3091 Directories contributing less than this percentage of the changes
3092 are not shown in the output.
3093 </p>
3094 </dd>
3095 </dl></div>
3096 </div></div>
3098 directories with less than 10% of the total amount of changed files,
3099 and accumulating child directory counts in the parent directories:
3101 </dd>
3103 diff.statGraphWidth
3104 </dt>
3105 <dd>
3106 <p>
3107 Limit the width of the graph part in --stat output. If set, applies
3108 to all commands generating --stat output except format-patch.
3109 </p>
3110 </dd>
3112 diff.context
3113 </dt>
3114 <dd>
3115 <p>
3117 of 3. This value is overridden by the -U option.
3118 </p>
3119 </dd>
3121 diff.interHunkContext
3122 </dt>
3123 <dd>
3124 <p>
3125 Show the context between diff hunks, up to the specified number
3126 of lines, thereby fusing the hunks that are close to each other.
3128 command line option.
3129 </p>
3130 </dd>
3132 diff.external
3133 </dt>
3134 <dd>
3135 <p>
3136 If this config variable is set, diff generation is not
3137 performed using the internal diff machinery, but using the
3139 environment variable. The command is called with parameters
3141 you want to use an external diff program only on a subset of
3143 </p>
3144 </dd>
3146 diff.ignoreSubmodules
3147 </dt>
3148 <dd>
3149 <p>
3150 Sets the default value of --ignore-submodules. Note that this
3154 this setting when reporting uncommitted changes. Setting it to
3157 overridden by using the --ignore-submodules command-line option.
3159 By default this is set to untracked so that any untracked
3160 submodules are ignored.
3161 </p>
3162 </dd>
3164 diff.mnemonicPrefix
3165 </dt>
3166 <dd>
3167 <p>
3170 this configuration is in effect, reverse diff output also swaps
3171 the order of the prefixes:
3172 </p>
3176 </dt>
3177 <dd>
3178 <p>
3179 compares the (i)ndex and the (w)ork tree;
3180 </p>
3181 </dd>
3184 </dt>
3185 <dd>
3186 <p>
3187 compares a (c)ommit and the (w)ork tree;
3188 </p>
3189 </dd>
3192 </dt>
3193 <dd>
3194 <p>
3195 compares a (c)ommit and the (i)ndex;
3196 </p>
3197 </dd>
3200 </dt>
3201 <dd>
3202 <p>
3203 compares an (o)bject and a (w)ork tree entity;
3204 </p>
3205 </dd>
3208 </dt>
3209 <dd>
3210 <p>
3212 </p>
3213 </dd>
3214 </dl></div>
3215 </dd>
3217 diff.noprefix
3218 </dt>
3219 <dd>
3220 <p>
3222 </p>
3223 </dd>
3225 diff.relative
3226 </dt>
3227 <dd>
3228 <p>
3230 and show pathnames relative to the current directory.
3231 </p>
3232 </dd>
3234 diff.orderFile
3235 </dt>
3236 <dd>
3237 <p>
3238 File indicating how to order files within a diff.
3241 relative to the top of the working tree.
3242 </p>
3243 </dd>
3245 diff.renameLimit
3246 </dt>
3247 <dd>
3248 <p>
3249 The number of files to consider in the exhaustive portion of
3252 setting has no effect if rename detection is turned off.
3253 </p>
3254 </dd>
3256 diff.renames
3257 </dt>
3258 <dd>
3259 <p>
3260 Whether and how Git detects renames. If set to "false",
3261 rename detection is disabled. If set to "true", basic rename
3263 detect copies, as well. Defaults to true. Note that this
3267 </p>
3268 </dd>
3270 diff.suppressBlankEmpty
3271 </dt>
3272 <dd>
3273 <p>
3274 A boolean to inhibit the standard behavior of printing a space
3275 before each empty output line. Defaults to false.
3276 </p>
3277 </dd>
3279 diff.submodule
3280 </dt>
3281 <dd>
3282 <p>
3283 Specify the format in which differences in submodules are
3284 shown. The "short" format just shows the names of the commits
3285 at the beginning and end of the range. The "log" format lists
3286 the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code>
3287 does. The "diff" format shows an inline diff of the changed
3288 contents of the submodule. Defaults to "short".
3289 </p>
3290 </dd>
3292 diff.wordRegex
3293 </dt>
3294 <dd>
3295 <p>
3296 A POSIX Extended Regular Expression used to determine what is a "word"
3297 when performing word-by-word difference calculations. Character
3298 sequences that match the regular expression are "words", all other
3300 </p>
3301 </dd>
3304 </dt>
3305 <dd>
3306 <p>
3308 for details.
3309 </p>
3310 </dd>
3313 </dt>
3314 <dd>
3315 <p>
3316 The regular expression that the diff driver should use to
3317 recognize the hunk header. A built-in pattern may also be used.
3319 </p>
3320 </dd>
3323 </dt>
3324 <dd>
3325 <p>
3326 Set this option to true to make the diff driver treat files as
3328 </p>
3329 </dd>
3332 </dt>
3333 <dd>
3334 <p>
3335 The command that the diff driver should call to generate the
3336 text-converted version of a file. The result of the
3337 conversion is used to generate a human-readable diff. See
3339 </p>
3340 </dd>
3343 </dt>
3344 <dd>
3345 <p>
3346 The regular expression that the diff driver should use to
3348 details.
3349 </p>
3350 </dd>
3353 </dt>
3354 <dd>
3355 <p>
3356 Set this option to true to make the diff driver cache the text
3358 </p>
3362 </dt>
3363 <dd>
3364 <p>
3365 Use Araxis Merge (requires a graphical session)
3366 </p>
3367 </dd>
3370 </dt>
3371 <dd>
3372 <p>
3373 Use Beyond Compare (requires a graphical session)
3374 </p>
3375 </dd>
3378 </dt>
3379 <dd>
3380 <p>
3381 Use Beyond Compare (requires a graphical session)
3382 </p>
3383 </dd>
3386 </dt>
3387 <dd>
3388 <p>
3389 Use Beyond Compare (requires a graphical session)
3390 </p>
3391 </dd>
3394 </dt>
3395 <dd>
3396 <p>
3397 Use Code Compare (requires a graphical session)
3398 </p>
3399 </dd>
3402 </dt>
3403 <dd>
3404 <p>
3405 Use DeltaWalker (requires a graphical session)
3406 </p>
3407 </dd>
3410 </dt>
3411 <dd>
3412 <p>
3413 Use DiffMerge (requires a graphical session)
3414 </p>
3415 </dd>
3418 </dt>
3419 <dd>
3420 <p>
3421 Use Diffuse (requires a graphical session)
3422 </p>
3423 </dd>
3426 </dt>
3427 <dd>
3428 <p>
3429 Use ECMerge (requires a graphical session)
3430 </p>
3431 </dd>
3434 </dt>
3435 <dd>
3436 <p>
3437 Use Emacs' Emerge
3438 </p>
3439 </dd>
3442 </dt>
3443 <dd>
3444 <p>
3445 Use ExamDiff Pro (requires a graphical session)
3446 </p>
3447 </dd>
3450 </dt>
3451 <dd>
3452 <p>
3453 Use Guiffy’s Diff Tool (requires a graphical session)
3454 </p>
3455 </dd>
3458 </dt>
3459 <dd>
3460 <p>
3461 Use gVim (requires a graphical session)
3462 </p>
3463 </dd>
3466 </dt>
3467 <dd>
3468 <p>
3469 Use KDiff3 (requires a graphical session)
3470 </p>
3471 </dd>
3474 </dt>
3475 <dd>
3476 <p>
3477 Use Kompare (requires a graphical session)
3478 </p>
3479 </dd>
3482 </dt>
3483 <dd>
3484 <p>
3485 Use Meld (requires a graphical session)
3486 </p>
3487 </dd>
3490 </dt>
3491 <dd>
3492 <p>
3493 Use Neovim
3494 </p>
3495 </dd>
3498 </dt>
3499 <dd>
3500 <p>
3501 Use FileMerge (requires a graphical session)
3502 </p>
3503 </dd>
3506 </dt>
3507 <dd>
3508 <p>
3509 Use HelixCore P4Merge (requires a graphical session)
3510 </p>
3511 </dd>
3514 </dt>
3515 <dd>
3516 <p>
3517 Use Sublime Merge (requires a graphical session)
3518 </p>
3519 </dd>
3522 </dt>
3523 <dd>
3524 <p>
3525 Use TkDiff (requires a graphical session)
3526 </p>
3527 </dd>
3530 </dt>
3531 <dd>
3532 <p>
3533 Use Vim
3534 </p>
3535 </dd>
3538 </dt>
3539 <dd>
3540 <p>
3541 Use WinMerge (requires a graphical session)
3542 </p>
3543 </dd>
3546 </dt>
3547 <dd>
3548 <p>
3549 Use xxdiff (requires a graphical session)
3550 </p>
3551 </dd>
3552 </dl></div>
3553 </dd>
3555 diff.indentHeuristic
3556 </dt>
3557 <dd>
3558 <p>
3560 that shift diff hunk boundaries to make patches easier to read.
3561 </p>
3562 </dd>
3564 diff.algorithm
3565 </dt>
3566 <dd>
3567 <p>
3568 Choose a diff algorithm. The variants are as follows:
3569 </p>
3575 </dt>
3576 <dd>
3577 <p>
3578 The basic greedy diff algorithm. Currently, this is the default.
3579 </p>
3580 </dd>
3583 </dt>
3584 <dd>
3585 <p>
3586 Spend extra time to make sure the smallest possible diff is
3587 produced.
3588 </p>
3589 </dd>
3592 </dt>
3593 <dd>
3594 <p>
3595 Use "patience diff" algorithm when generating patches.
3596 </p>
3597 </dd>
3600 </dt>
3601 <dd>
3602 <p>
3603 This algorithm extends the patience algorithm to "support
3604 low-occurrence common elements".
3605 </p>
3606 </dd>
3607 </dl></div>
3608 </div></div>
3609 </dd>
3611 diff.wsErrorHighlight
3612 </dt>
3613 <dd>
3614 <p>
3616 lines of the diff. Multiple values are separated by comma,
3621 overrides this setting.
3622 </p>
3623 </dd>
3625 diff.colorMoved
3626 </dt>
3627 <dd>
3628 <p>
3630 in a diff are colored differently, for details of valid modes
3632 true the default color mode will be used. When set to false,
3633 moved lines are not colored.
3634 </p>
3635 </dd>
3637 diff.colorMovedWS
3638 </dt>
3639 <dd>
3640 <p>
3643 for details of valid modes see <em>--color-moved-ws</em> in <a href="git-diff.html">git-diff(1)</a>.
3644 </p>
3645 </dd>
3646 </dl></div>
3647 </div>
3648 </div>
3659 </div>
3660 </div>
3665 </div>
3666 </div>
3667 </div>
3671 Last updated
3673 </div>
3674 </div>
3675 </body>
3676 </html>