| blob | 84d24cc9aa2349e292a5217b2884d6e03503aaf9 |
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 the name of each changed file in the post-image tree.
1286 The file names are often encoded in UTF-8.
1287 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1288 manual page.
1289 </p>
1290 </dd>
1292 --name-status
1293 </dt>
1294 <dd>
1295 <p>
1296 Show only the name(s) and status of each changed file. See the description
1299 </p>
1300 </dd>
1303 </dt>
1304 <dd>
1305 <p>
1306 Specify how differences in submodules are shown. When specifying
1308 shows the names of the commits at the beginning and end of the range.
1310 format is used. This format lists the commits in the range like
1311 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1313 inline diff of the changes in the submodule contents between the
1315 if the config option is unset.
1316 </p>
1317 </dd>
1320 </dt>
1321 <dd>
1322 <p>
1323 Show colored diff.
1324 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
1325 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
1327 configuration settings.
1328 </p>
1329 </dd>
1331 --no-color
1332 </dt>
1333 <dd>
1334 <p>
1335 Turn off colored diff.
1336 This can be used to override configuration settings.
1338 </p>
1339 </dd>
1342 </dt>
1343 <dd>
1344 <p>
1345 Moved lines of code are colored differently.
1349 The mode must be one of:
1350 </p>
1355 no
1356 </dt>
1357 <dd>
1358 <p>
1359 Moved lines are not highlighted.
1360 </p>
1361 </dd>
1363 default
1364 </dt>
1365 <dd>
1366 <p>
1368 in the future.
1369 </p>
1370 </dd>
1372 plain
1373 </dt>
1374 <dd>
1375 <p>
1376 Any line that is added in one location and was removed
1379 that are added somewhere else in the diff. This mode picks up any
1380 moved line, but it is not very useful in a review to determine
1381 if a block of code was moved without permutation.
1382 </p>
1383 </dd>
1385 blocks
1386 </dt>
1387 <dd>
1388 <p>
1389 Blocks of moved text of at least 20 alphanumeric characters
1390 are detected greedily. The detected blocks are
1392 Adjacent blocks cannot be told apart.
1393 </p>
1394 </dd>
1396 zebra
1397 </dt>
1398 <dd>
1399 <p>
1403 the two colors indicates that a new block was detected.
1404 </p>
1405 </dd>
1407 dimmed-zebra
1408 </dt>
1409 <dd>
1410 <p>
1412 of moved code is performed. The bordering lines of two adjacent
1413 blocks are considered interesting, the rest is uninteresting.
1415 </p>
1416 </dd>
1417 </dl></div>
1418 </div></div>
1419 </dd>
1421 --no-color-moved
1422 </dt>
1423 <dd>
1424 <p>
1425 Turn off move detection. This can be used to override configuration
1427 </p>
1428 </dd>
1431 </dt>
1432 <dd>
1433 <p>
1434 This configures how whitespace is ignored when performing the
1437 These modes can be given as a comma separated list:
1438 </p>
1443 no
1444 </dt>
1445 <dd>
1446 <p>
1447 Do not ignore whitespace when performing move detection.
1448 </p>
1449 </dd>
1451 ignore-space-at-eol
1452 </dt>
1453 <dd>
1454 <p>
1455 Ignore changes in whitespace at EOL.
1456 </p>
1457 </dd>
1459 ignore-space-change
1460 </dt>
1461 <dd>
1462 <p>
1463 Ignore changes in amount of whitespace. This ignores whitespace
1464 at line end, and considers all other sequences of one or
1465 more whitespace characters to be equivalent.
1466 </p>
1467 </dd>
1469 ignore-all-space
1470 </dt>
1471 <dd>
1472 <p>
1473 Ignore whitespace when comparing lines. This ignores differences
1474 even if one line has whitespace where the other line has none.
1475 </p>
1476 </dd>
1478 allow-indentation-change
1479 </dt>
1480 <dd>
1481 <p>
1482 Initially ignore any whitespace in the move detection, then
1483 group the moved code blocks only into a block if the change in
1484 whitespace is the same per line. This is incompatible with the
1485 other modes.
1486 </p>
1487 </dd>
1488 </dl></div>
1489 </div></div>
1490 </dd>
1492 --no-color-moved-ws
1493 </dt>
1494 <dd>
1495 <p>
1496 Do not ignore whitespace when performing move detection. This can be
1497 used to override configuration settings. It is the same as
1499 </p>
1500 </dd>
1503 </dt>
1504 <dd>
1505 <p>
1507 By default, words are delimited by whitespace; see
1509 must be one of:
1510 </p>
1515 color
1516 </dt>
1517 <dd>
1518 <p>
1520 </p>
1521 </dd>
1523 plain
1524 </dt>
1525 <dd>
1526 <p>
1528 attempts to escape the delimiters if they appear in the input,
1529 so the output may be ambiguous.
1530 </p>
1531 </dd>
1533 porcelain
1534 </dt>
1535 <dd>
1536 <p>
1537 Use a special line-based format intended for script
1538 consumption. Added/removed/unchanged runs are printed in the
1540 character at the beginning of the line and extending to the
1541 end of the line. Newlines in the input are represented by a
1543 </p>
1544 </dd>
1546 none
1547 </dt>
1548 <dd>
1549 <p>
1550 Disable word diff again.
1551 </p>
1552 </dd>
1553 </dl></div>
1554 </div></div>
1556 highlight the changed parts in all modes if enabled.</p></div>
1557 </dd>
1560 </dt>
1561 <dd>
1562 <p>
1564 runs of non-whitespace to be a word. Also implies
1566 </p>
1569 considered whitespace and ignored(!) for the purposes of finding
1571 expression to make sure that it matches all non-whitespace characters.
1572 A match that contains a newline is silently truncated(!) at the
1573 newline.</p></div>
1574 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1575 and, correspondingly, show differences character by character.</p></div>
1576 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1577 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
1578 overrides any diff driver or configuration setting. Diff drivers
1579 override configuration settings.</p></div>
1580 </dd>
1583 </dt>
1584 <dd>
1585 <p>
1588 </p>
1589 </dd>
1591 --no-renames
1592 </dt>
1593 <dd>
1594 <p>
1595 Turn off rename detection, even when the configuration
1596 file gives the default to do so.
1597 </p>
1598 </dd>
1600 --[no-]rename-empty
1601 </dt>
1602 <dd>
1603 <p>
1604 Whether to use empty blobs as rename source.
1605 </p>
1606 </dd>
1608 --check
1609 </dt>
1610 <dd>
1611 <p>
1612 Warn if changes introduce conflict markers or whitespace errors.
1614 configuration. By default, trailing whitespaces (including
1615 lines that consist solely of whitespaces) and a space character
1616 that is immediately followed by a tab character inside the
1617 initial indent of the line are considered whitespace errors.
1618 Exits with non-zero status if problems are found. Not compatible
1619 with --exit-code.
1620 </p>
1621 </dd>
1624 </dt>
1625 <dd>
1626 <p>
1628 lines of the diff. Multiple values are separated by comma,
1631 this option is not given, and the configuration variable
1635 </p>
1636 </dd>
1638 --full-index
1639 </dt>
1640 <dd>
1641 <p>
1642 Instead of the first handful of characters, show the full
1643 pre- and post-image blob object names on the "index"
1644 line when generating patch format output.
1645 </p>
1646 </dd>
1648 --binary
1649 </dt>
1650 <dd>
1651 <p>
1655 </p>
1656 </dd>
1659 </dt>
1660 <dd>
1661 <p>
1662 Instead of showing the full 40-byte hexadecimal object
1663 name in diff-raw format output and diff-tree header
1665 hexdigits long that uniquely refers the object.
1670 </p>
1671 </dd>
1674 </dt>
1677 </dt>
1678 <dd>
1679 <p>
1680 Break complete rewrite changes into pairs of delete and
1681 create. This serves two purposes:
1682 </p>
1683 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1684 not as a series of deletion and insertion mixed together with a very
1685 few lines that happen to match textually as the context, but as a
1686 single deletion of everything old followed by a single insertion of
1689 original should remain in the result for Git to consider it a total
1690 rewrite (i.e. otherwise the resulting patch will be a series of
1691 deletion and insertion mixed together with context lines).</p></div>
1692 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1693 source of a rename (usually -M only considers a file that disappeared
1697 eligible for being picked up as a possible source of a rename to
1698 another file.</p></div>
1699 </dd>
1702 </dt>
1705 </dt>
1706 <dd>
1707 <p>
1708 Detect renames.
1710 index (i.e. amount of addition/deletions compared to the
1712 delete/add pair to be a rename if more than 90% of the file
1718 </p>
1719 </dd>
1722 </dt>
1725 </dt>
1726 <dd>
1727 <p>
1730 </p>
1731 </dd>
1733 --find-copies-harder
1734 </dt>
1735 <dd>
1736 <p>
1738 if the original file of the copy was modified in the same
1739 changeset. This flag makes the command
1740 inspect unmodified files as candidates for the source of
1741 copy. This is a very expensive operation for large
1742 projects, so use it with caution. Giving more than one
1744 </p>
1745 </dd>
1747 -D
1748 </dt>
1750 --irreversible-delete
1751 </dt>
1752 <dd>
1753 <p>
1754 Omit the preimage for deletes, i.e. print only the header but not
1757 solely for people who want to just concentrate on reviewing the
1758 text after the change. In addition, the output obviously lacks
1759 enough information to apply such a patch in reverse, even manually,
1760 hence the name of the option.
1761 </p>
1762 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1763 of a delete/create pair.</p></div>
1764 </dd>
1767 </dt>
1768 <dd>
1769 <p>
1771 can detect subsets of renames/copies cheaply, followed by an
1772 exhaustive fallback portion that compares all remaining
1773 unpaired destinations to all relevant sources. (For renames,
1774 only remaining unpaired sources are relevant; for copies, all
1775 original sources are relevant.) For N sources and
1776 destinations, this exhaustive check is O(N^2). This option
1777 prevents the exhaustive portion of rename/copy detection from
1778 running if the number of source/destination files involved
1779 exceeds the specified number. Defaults to diff.renameLimit.
1780 Note that a value of 0 is treated as unlimited.
1781 </p>
1782 </dd>
1784 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1785 </dt>
1786 <dd>
1787 <p>
1793 Any combination of the filter characters (including none) can be used.
1795 paths are selected if there is any file that matches
1796 other criteria in the comparison; if there is no file
1797 that matches other criteria, nothing is selected.
1798 </p>
1801 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1802 renamed entries cannot appear if detection for those types is disabled.</p></div>
1803 </dd>
1806 </dt>
1807 <dd>
1808 <p>
1809 Look for differences that change the number of occurrences of
1810 the specified string (i.e. addition/deletion) in a file.
1811 Intended for the scripter’s use.
1812 </p>
1813 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
1814 struct), and want to know the history of that block since it first
1815 came into being: use the feature iteratively to feed the interesting
1817 very first version of the block.</p></div>
1819 </dd>
1822 </dt>
1823 <dd>
1824 <p>
1825 Look for differences whose patch text contains added/removed
1827 </p>
1828 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
1830 file:</p></div>
1834 ...
1836 </div></div>
1837 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1839 occurrences of that string did not change).</p></div>
1840 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1841 filter will be ignored.</p></div>
1842 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1843 information.</p></div>
1844 </dd>
1847 </dt>
1848 <dd>
1849 <p>
1850 Look for differences that change the number of occurrences of
1852 in that it doesn’t search for a specific string but for a specific
1853 object id.
1854 </p>
1855 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1857 </dd>
1859 --pickaxe-all
1860 </dt>
1861 <dd>
1862 <p>
1864 changeset, not just the files that contain the change
1866 </p>
1867 </dd>
1869 --pickaxe-regex
1870 </dt>
1871 <dd>
1872 <p>
1874 expression to match.
1875 </p>
1876 </dd>
1879 </dt>
1880 <dd>
1881 <p>
1882 Control the order in which files appear in the output.
1886 </p>
1889 All files with pathnames that match the first pattern are output
1890 first, all files with pathnames that match the second pattern (but not
1891 the first) are output next, and so on.
1892 All files with pathnames that do not match any pattern are output
1893 last, as if there was an implicit match-all pattern at the end of the
1894 file.
1895 If multiple pathnames have the same rank (they match the same pattern
1896 but no earlier patterns), their output order relative to each other is
1897 the normal order.</p></div>
1902 <li>
1903 <p>
1904 Blank lines are ignored, so they can be used as separators for
1905 readability.
1906 </p>
1907 </li>
1908 <li>
1909 <p>
1910 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1911 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1912 pattern if it starts with a hash.
1913 </p>
1914 </li>
1915 <li>
1916 <p>
1917 Each other line contains a single pattern.
1918 </p>
1919 </li>
1920 </ul></div>
1921 </div></div>
1923 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1924 matches a pattern if removing any number of the final pathname
1925 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1926 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
1927 </dd>
1930 </dt>
1933 </dt>
1934 <dd>
1935 <p>
1940 otherwise.
1941 </p>
1942 </dd>
1944 -R
1945 </dt>
1946 <dd>
1947 <p>
1948 Swap two inputs; that is, show differences from index or
1949 on-disk file to tree contents.
1950 </p>
1951 </dd>
1954 </dt>
1956 --no-relative
1957 </dt>
1958 <dd>
1959 <p>
1960 When run from a subdirectory of the project, it can be
1961 told to exclude changes outside the directory and show
1962 pathnames relative to it with this option. When you are
1963 not in a subdirectory (e.g. in a bare repository), you
1964 can name which subdirectory to make the output relative
1968 </p>
1969 </dd>
1971 -a
1972 </dt>
1974 --text
1975 </dt>
1976 <dd>
1977 <p>
1978 Treat all files as text.
1979 </p>
1980 </dd>
1982 --ignore-cr-at-eol
1983 </dt>
1984 <dd>
1985 <p>
1986 Ignore carriage-return at the end of line when doing a comparison.
1987 </p>
1988 </dd>
1990 --ignore-space-at-eol
1991 </dt>
1992 <dd>
1993 <p>
1994 Ignore changes in whitespace at EOL.
1995 </p>
1996 </dd>
1998 -b
1999 </dt>
2001 --ignore-space-change
2002 </dt>
2003 <dd>
2004 <p>
2005 Ignore changes in amount of whitespace. This ignores whitespace
2006 at line end, and considers all other sequences of one or
2007 more whitespace characters to be equivalent.
2008 </p>
2009 </dd>
2011 -w
2012 </dt>
2014 --ignore-all-space
2015 </dt>
2016 <dd>
2017 <p>
2018 Ignore whitespace when comparing lines. This ignores
2019 differences even if one line has whitespace where the other
2020 line has none.
2021 </p>
2022 </dd>
2024 --ignore-blank-lines
2025 </dt>
2026 <dd>
2027 <p>
2028 Ignore changes whose lines are all blank.
2029 </p>
2030 </dd>
2033 </dt>
2036 </dt>
2037 <dd>
2038 <p>
2040 be specified more than once.
2041 </p>
2042 </dd>
2045 </dt>
2046 <dd>
2047 <p>
2048 Show the context between diff hunks, up to the specified number
2049 of lines, thereby fusing hunks that are close to each other.
2051 is unset.
2052 </p>
2053 </dd>
2055 -W
2056 </dt>
2058 --function-context
2059 </dt>
2060 <dd>
2061 <p>
2062 Show whole function as context lines for each change.
2063 The function names are determined in the same way as
2066 </p>
2067 </dd>
2069 --exit-code
2070 </dt>
2071 <dd>
2072 <p>
2073 Make the program exit with codes similar to diff(1).
2074 That is, it exits with 1 if there were differences and
2075 0 means no differences.
2076 </p>
2077 </dd>
2079 --quiet
2080 </dt>
2081 <dd>
2082 <p>
2084 </p>
2085 </dd>
2087 --ext-diff
2088 </dt>
2089 <dd>
2090 <p>
2091 Allow an external diff helper to be executed. If you set an
2094 </p>
2095 </dd>
2097 --no-ext-diff
2098 </dt>
2099 <dd>
2100 <p>
2101 Disallow external diff drivers.
2102 </p>
2103 </dd>
2105 --textconv
2106 </dt>
2108 --no-textconv
2109 </dt>
2110 <dd>
2111 <p>
2112 Allow (or disallow) external text conversion filters to be run
2114 details. Because textconv filters are typically a one-way
2115 conversion, the resulting diff is suitable for human
2116 consumption, but cannot be applied. For this reason, textconv
2118 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
2119 diff plumbing commands.
2120 </p>
2121 </dd>
2124 </dt>
2125 <dd>
2126 <p>
2129 Using "none" will consider the submodule modified when it either contains
2130 untracked or modified files or its HEAD differs from the commit recorded
2131 in the superproject and can be used to override any settings of the
2132 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2133 "untracked" is used submodules are not considered dirty when they only
2134 contain untracked content (but they are still scanned for modified
2135 content). Using "dirty" ignores all changes to the work tree of submodules,
2136 only changes to the commits stored in the superproject are shown (this was
2138 </p>
2139 </dd>
2142 </dt>
2143 <dd>
2144 <p>
2145 Show the given source prefix instead of "a/".
2146 </p>
2147 </dd>
2150 </dt>
2151 <dd>
2152 <p>
2153 Show the given destination prefix instead of "b/".
2154 </p>
2155 </dd>
2157 --no-prefix
2158 </dt>
2159 <dd>
2160 <p>
2161 Do not show any source or destination prefix.
2162 </p>
2163 </dd>
2165 --default-prefix
2166 </dt>
2167 <dd>
2168 <p>
2173 </p>
2174 </dd>
2177 </dt>
2178 <dd>
2179 <p>
2180 Prepend an additional prefix to every line of output.
2181 </p>
2182 </dd>
2184 --ita-invisible-in-index
2185 </dt>
2186 <dd>
2187 <p>
2188 By default entries added by "git add -N" appear as an existing
2190 This option makes the entry appear as a new file in "git diff"
2191 and non-existent in "git diff --cached". This option could be
2193 experimental and could be removed in future.
2194 </p>
2195 </dd>
2196 </dl></div>
2201 -1 --base
2202 </dt>
2204 -2 --ours
2205 </dt>
2207 -3 --theirs
2208 </dt>
2209 <dd>
2210 <p>
2213 index contains these stages only for unmerged entries i.e.
2215 section "3-Way Merge" for detailed information.
2216 </p>
2217 </dd>
2219 -0
2220 </dt>
2221 <dd>
2222 <p>
2223 Omit diff output for unmerged entries and just show
2224 "Unmerged". Can be used only when comparing the working tree
2225 with the index.
2226 </p>
2227 </dd>
2230 </dt>
2231 <dd>
2232 <p>
2234 the diff to the named paths (you can give directory
2235 names and get diff for all files under them).
2236 </p>
2237 </dd>
2238 </dl></div>
2239 </div>
2240 </div>
2247 compared differs:</p></div>
2251 </dt>
2252 <dd>
2253 <p>
2255 </p>
2256 </dd>
2259 </dt>
2260 <dd>
2261 <p>
2263 </p>
2264 </dd>
2267 </dt>
2268 <dd>
2269 <p>
2270 compares the trees named by the two arguments.
2271 </p>
2272 </dd>
2275 </dt>
2276 <dd>
2277 <p>
2278 compares the index and the files on the filesystem.
2279 </p>
2280 </dd>
2281 </dl></div>
2282 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
2283 what is being compared. After that, all the commands print one output
2284 line per changed file.</p></div>
2291 create :000000 100644 0000000 1234567 A file4
2292 delete :100644 000000 1234567 0000000 D file5
2294 </div></div>
2297 <li>
2298 <p>
2299 a colon.
2300 </p>
2301 </li>
2302 <li>
2303 <p>
2305 </p>
2306 </li>
2307 <li>
2308 <p>
2309 a space.
2310 </p>
2311 </li>
2312 <li>
2313 <p>
2315 </p>
2316 </li>
2317 <li>
2318 <p>
2319 a space.
2320 </p>
2321 </li>
2322 <li>
2323 <p>
2325 </p>
2326 </li>
2327 <li>
2328 <p>
2329 a space.
2330 </p>
2331 </li>
2332 <li>
2333 <p>
2335 </p>
2336 </li>
2337 <li>
2338 <p>
2339 a space.
2340 </p>
2341 </li>
2342 <li>
2343 <p>
2344 status, followed by optional "score" number.
2345 </p>
2346 </li>
2347 <li>
2348 <p>
2350 </p>
2351 </li>
2352 <li>
2353 <p>
2354 path for "src"
2355 </p>
2356 </li>
2357 <li>
2358 <p>
2360 </p>
2361 </li>
2362 <li>
2363 <p>
2364 path for "dst"; only exists for C or R.
2365 </p>
2366 </li>
2367 <li>
2368 <p>
2370 </p>
2371 </li>
2372 </ol></div>
2375 <li>
2376 <p>
2377 A: addition of a file
2378 </p>
2379 </li>
2380 <li>
2381 <p>
2382 C: copy of a file into a new one
2383 </p>
2384 </li>
2385 <li>
2386 <p>
2387 D: deletion of a file
2388 </p>
2389 </li>
2390 <li>
2391 <p>
2392 M: modification of the contents or mode of a file
2393 </p>
2394 </li>
2395 <li>
2396 <p>
2397 R: renaming of a file
2398 </p>
2399 </li>
2400 <li>
2401 <p>
2402 T: change in the type of the file (regular file, symbolic link or submodule)
2403 </p>
2404 </li>
2405 <li>
2406 <p>
2407 U: file is unmerged (you must complete the merge before it can
2408 be committed)
2409 </p>
2410 </li>
2411 <li>
2412 <p>
2413 X: "unknown" change type (most probably a bug, please report it)
2414 </p>
2415 </li>
2416 </ul></div>
2418 percentage of similarity between the source and target of the move or
2419 copy). Status letter M may be followed by a score (denoting the
2420 percentage of dissimilarity) for file rewrites.</p></div>
2421 <div class="paragraph"><p>The sha1 for "dst" is shown as all 0’s if a file on the filesystem
2422 is out of sync with the index.</p></div>
2427 </div></div>
2428 <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2430 (see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2431 verbatim and the line is terminated by a NUL byte.</p></div>
2432 </div>
2433 </div>
2439 to generate diff output also for merge commits. The output differs
2440 from the format described above in the following way:</p></div>
2442 <li>
2443 <p>
2444 there is a colon for each parent
2445 </p>
2446 </li>
2447 <li>
2448 <p>
2450 </p>
2451 </li>
2452 <li>
2453 <p>
2454 status is concatenated status characters for each parent
2455 </p>
2456 </li>
2457 <li>
2458 <p>
2459 no optional "score" number
2460 </p>
2461 </li>
2462 <li>
2463 <p>
2464 tab-separated pathname(s) of the file
2465 </p>
2466 </li>
2467 </ol></div>
2468 <div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2469 if the file was renamed on any side of history. With
2471 followed by the name of the path in the merge commit.</p></div>
2472 <div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
2478 </div></div>
2479 <div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2485 </div></div>
2486 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2487 all parents.</p></div>
2488 </div>
2489 </div>
2501 You can customize the creation of patch text via the
2503 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
2504 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2505 diff format:</p></div>
2507 <li>
2508 <p>
2509 It is preceded by a "git diff" header that looks like this:
2510 </p>
2514 </div></div>
2515 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
2516 involved. Especially, even for a creation or a deletion,
2517 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2518 <div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
2519 name of the source file of the rename/copy and the name of
2520 the file that the rename/copy produces, respectively.</p></div>
2521 </li>
2522 <li>
2523 <p>
2524 It is followed by one or more extended header lines:
2525 </p>
2539 </div></div>
2540 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2541 and file permission bits.</p></div>
2542 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
2544 the dissimilarity index is the percentage of changed lines. It
2545 is a rounded down integer, followed by a percent sign. The
2546 similarity index value of 100% is thus reserved for two equal
2547 files, while 100% dissimilarity means that no line from the old
2548 file made it into the new one.</p></div>
2549 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
2551 separate lines indicate the old and the new mode.</p></div>
2552 </li>
2553 <li>
2554 <p>
2555 Pathnames with "unusual" characters are quoted as explained for
2558 </p>
2559 </li>
2560 <li>
2561 <p>
2564 It is incorrect to apply each change to each file sequentially. For
2565 example, this patch will swap a and b:
2566 </p>
2569 <pre><code>diff --git a/a b/b
2570 rename from a
2571 rename to b
2572 diff --git a/b b/a
2573 rename from b
2574 rename to a</code></pre>
2575 </div></div>
2576 </li>
2577 <li>
2578 <p>
2579 Hunk headers mention the name of the function to which the hunk
2580 applies. See "Defining a custom hunk-header" in
2582 specific languages.
2583 </p>
2584 </li>
2585 </ol></div>
2586 </div>
2587 </div>
2591 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
2596 diffs in a specific format.</p></div>
2600 <pre><code>diff --combined describe.c
2601 index fabadb8,cc95eb0..4866510
2602 --- a/describe.c
2603 +++ b/describe.c
2606 }
2608 - static void describe(char *arg)
2609 -static void describe(struct commit *cmit, int last_one)
2610 ++static void describe(char *arg, int last_one)
2611 {
2612 + unsigned char sha1[20];
2613 + struct commit *cmit;
2614 struct commit_list *list;
2615 static int initialized = 0;
2616 struct commit_name *n;
2619 + usage(describe_usage);
2620 + cmit = lookup_commit_reference(sha1);
2621 + if (!cmit)
2622 + usage(describe_usage);
2623 +
2624 if (!initialized) {
2625 initialized = 1;
2626 for_each_ref(get_name);</code></pre>
2627 </div></div>
2629 <li>
2630 <p>
2631 It is preceded by a "git diff" header, that looks like
2633 </p>
2637 </div></div>
2642 </div></div>
2643 </li>
2644 <li>
2645 <p>
2646 It is followed by one or more extended header lines
2647 (this example shows a merge with two parents):
2648 </p>
2655 </div></div>
2656 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
2658 information about detected content movement (renames and
2659 copying detection) are designed to work with the diff of two
2661 </li>
2662 <li>
2663 <p>
2664 It is followed by a two-line from-file/to-file header:
2665 </p>
2668 <pre><code>--- a/file
2669 +++ b/file</code></pre>
2670 </div></div>
2671 <div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
2673 files.</p></div>
2674 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2675 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
2676 where N is the number of parents in the merge commit:</p></div>
2679 <pre><code>--- a/file
2680 --- a/file
2681 --- a/file
2682 +++ b/file</code></pre>
2683 </div></div>
2685 active, to allow you to see the original name of the file in different
2686 parents.</p></div>
2687 </li>
2688 <li>
2689 <p>
2690 Chunk header format is modified to prevent people from
2692 was created for review of merge commit changes, and was not
2693 meant to be applied. The change is similar to the change in the
2695 </p>
2698 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
2699 </div></div>
2700 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
2701 header for combined diff format.</p></div>
2702 </li>
2703 </ol></div>
2705 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
2707 compares two or more files file1, file2,… with one file X, and
2708 shows how X differs from each of fileN. One column for each of
2709 fileN is prepended to the output line to note how X’s line is
2710 different from it.</p></div>
2711 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2713 in the column N means that the line appears in the result,
2714 and fileN does not have that line (in other words, the line was
2715 added, from the point of view of that parent).</p></div>
2719 in either file1 or file2). Also, eight other lines are the same
2721 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
2722 merge commit with the merge result (i.e. file1..fileN are the
2724 two unresolved merge parents with the working tree file
2727 </div>
2728 </div>
2732 <div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2734 output. These options can be combined with other options, such as
2736 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
2737 formats the pathnames compactly by combining common prefix and suffix of
2743 </div></div>
2744 <div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2746 like this:</p></div>
2751 </div></div>
2754 <li>
2755 <p>
2756 the number of added lines;
2757 </p>
2758 </li>
2759 <li>
2760 <p>
2761 a tab;
2762 </p>
2763 </li>
2764 <li>
2765 <p>
2766 the number of deleted lines;
2767 </p>
2768 </li>
2769 <li>
2770 <p>
2771 a tab;
2772 </p>
2773 </li>
2774 <li>
2775 <p>
2776 pathname (possibly with rename/copy information);
2777 </p>
2778 </li>
2779 <li>
2780 <p>
2781 a newline.
2782 </p>
2783 </li>
2784 </ol></div>
2785 <div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
2790 </div></div>
2793 <li>
2794 <p>
2795 the number of added lines;
2796 </p>
2797 </li>
2798 <li>
2799 <p>
2800 a tab;
2801 </p>
2802 </li>
2803 <li>
2804 <p>
2805 the number of deleted lines;
2806 </p>
2807 </li>
2808 <li>
2809 <p>
2810 a tab;
2811 </p>
2812 </li>
2813 <li>
2814 <p>
2815 a NUL (only exists if renamed/copied);
2816 </p>
2817 </li>
2818 <li>
2819 <p>
2820 pathname in preimage;
2821 </p>
2822 </li>
2823 <li>
2824 <p>
2825 a NUL (only exists if renamed/copied);
2826 </p>
2827 </li>
2828 <li>
2829 <p>
2830 pathname in postimage (only exists if renamed/copied);
2831 </p>
2832 </li>
2833 <li>
2834 <p>
2835 a NUL.
2836 </p>
2837 </li>
2838 </ol></div>
2839 <div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
2840 scripts that read the output to tell if the current record being read is
2841 a single-path record or a rename/copy record without reading ahead.
2844 </div>
2845 </div>
2851 Various ways to check your working tree
2852 </dt>
2853 <dd>
2860 </div></div>
2862 <li>
2863 <p>
2864 Changes in the working tree not yet staged for the next commit.
2865 </p>
2866 </li>
2867 <li>
2868 <p>
2869 Changes between the index and your last commit; what you
2871 </p>
2872 </li>
2873 <li>
2874 <p>
2875 Changes in the working tree since your last commit; what you
2877 </p>
2878 </li>
2879 <li>
2880 <p>
2881 Changes in the working tree you’ve made to resolve textual
2882 conflicts so far.
2883 </p>
2884 </li>
2885 </ol></div>
2886 </dd>
2888 Comparing with arbitrary commits
2889 </dt>
2890 <dd>
2896 </div></div>
2898 <li>
2899 <p>
2900 Instead of using the tip of the current branch, compare with the
2901 tip of "test" branch.
2902 </p>
2903 </li>
2904 <li>
2905 <p>
2906 Instead of comparing with the tip of "test" branch, compare with
2907 the tip of the current branch, but limit the comparison to the
2908 file "test".
2909 </p>
2910 </li>
2911 <li>
2912 <p>
2913 Compare the version before the last commit and the last commit.
2914 </p>
2915 </li>
2916 </ol></div>
2917 </dd>
2919 Comparing branches
2920 </dt>
2921 <dd>
2927 </div></div>
2929 <li>
2930 <p>
2931 Changes between the tips of the topic and the master branches.
2932 </p>
2933 </li>
2934 <li>
2935 <p>
2936 Same as above.
2937 </p>
2938 </li>
2939 <li>
2940 <p>
2941 Changes that occurred on the master branch since when the topic
2942 branch was started off it.
2943 </p>
2944 </li>
2945 </ol></div>
2946 </dd>
2948 Limiting the diff output
2949 </dt>
2950 <dd>
2956 </div></div>
2958 <li>
2959 <p>
2960 Show only modification, rename, and copy, but not addition
2961 or deletion.
2962 </p>
2963 </li>
2964 <li>
2965 <p>
2966 Show only names and the nature of change, but not actual
2967 diff output.
2968 </p>
2969 </li>
2970 <li>
2971 <p>
2972 Limit diff output to named subtrees.
2973 </p>
2974 </li>
2975 </ol></div>
2976 </dd>
2978 Munging the diff output
2979 </dt>
2980 <dd>
2985 </div></div>
2987 <li>
2988 <p>
2989 Spend extra cycles to find renames, copies and complete
2990 rewrites (very expensive).
2991 </p>
2992 </li>
2993 <li>
2994 <p>
2995 Output diff in reverse.
2996 </p>
2997 </li>
2998 </ol></div>
2999 </dd>
3000 </dl></div>
3001 </div>
3002 </div>
3011 diff.autoRefreshIndex
3012 </dt>
3013 <dd>
3014 <p>
3016 files, do not consider stat-only changes as changed.
3018 update the cached stat information for paths whose
3019 contents in the work tree match the contents in the
3020 index. This option defaults to true. Note that this
3023 </p>
3024 </dd>
3026 diff.dirstat
3027 </dt>
3028 <dd>
3029 <p>
3031 default behavior of the <code>--dirstat</code> option to <a href="git-diff.html">git-diff(1)</a>
3032 and friends. The defaults can be overridden on the command line
3035 The following parameters are available:
3036 </p>
3042 </dt>
3043 <dd>
3044 <p>
3045 Compute the dirstat numbers by counting the lines that have been
3046 removed from the source, or added to the destination. This ignores
3047 the amount of pure code movements within a file. In other words,
3048 rearranging lines in a file is not counted as much as other changes.
3049 This is the default behavior when no parameter is given.
3050 </p>
3051 </dd>
3054 </dt>
3055 <dd>
3056 <p>
3057 Compute the dirstat numbers by doing the regular line-based diff
3058 analysis, and summing the removed/added line counts. (For binary
3059 files, count 64-byte chunks instead, since binary files have no
3062 lines within a file as much as other changes. The resulting output
3064 </p>
3065 </dd>
3068 </dt>
3069 <dd>
3070 <p>
3071 Compute the dirstat numbers by counting the number of files changed.
3072 Each changed file counts equally in the dirstat analysis. This is
3074 not have to look at the file contents at all.
3075 </p>
3076 </dd>
3079 </dt>
3080 <dd>
3081 <p>
3082 Count changes in a child directory for the parent directory as well.
3084 reported may exceed 100%. The default (non-cumulative) behavior can
3086 </p>
3087 </dd>
3090 </dt>
3091 <dd>
3092 <p>
3093 An integer parameter specifies a cut-off percent (3% by default).
3094 Directories contributing less than this percentage of the changes
3095 are not shown in the output.
3096 </p>
3097 </dd>
3098 </dl></div>
3099 </div></div>
3101 directories with less than 10% of the total amount of changed files,
3102 and accumulating child directory counts in the parent directories:
3104 </dd>
3106 diff.statNameWidth
3107 </dt>
3108 <dd>
3109 <p>
3110 Limit the width of the filename part in --stat output. If set, applies
3111 to all commands generating --stat output except format-patch.
3112 </p>
3113 </dd>
3115 diff.statGraphWidth
3116 </dt>
3117 <dd>
3118 <p>
3119 Limit the width of the graph part in --stat output. If set, applies
3120 to all commands generating --stat output except format-patch.
3121 </p>
3122 </dd>
3124 diff.context
3125 </dt>
3126 <dd>
3127 <p>
3129 of 3. This value is overridden by the -U option.
3130 </p>
3131 </dd>
3133 diff.interHunkContext
3134 </dt>
3135 <dd>
3136 <p>
3137 Show the context between diff hunks, up to the specified number
3138 of lines, thereby fusing the hunks that are close to each other.
3140 command line option.
3141 </p>
3142 </dd>
3144 diff.external
3145 </dt>
3146 <dd>
3147 <p>
3148 If this config variable is set, diff generation is not
3149 performed using the internal diff machinery, but using the
3151 environment variable. The command is called with parameters
3153 you want to use an external diff program only on a subset of
3155 </p>
3156 </dd>
3158 diff.ignoreSubmodules
3159 </dt>
3160 <dd>
3161 <p>
3162 Sets the default value of --ignore-submodules. Note that this
3166 this setting when reporting uncommitted changes. Setting it to
3169 overridden by using the --ignore-submodules command-line option.
3171 By default this is set to untracked so that any untracked
3172 submodules are ignored.
3173 </p>
3174 </dd>
3176 diff.mnemonicPrefix
3177 </dt>
3178 <dd>
3179 <p>
3182 this configuration is in effect, reverse diff output also swaps
3183 the order of the prefixes:
3184 </p>
3188 </dt>
3189 <dd>
3190 <p>
3191 compares the (i)ndex and the (w)ork tree;
3192 </p>
3193 </dd>
3196 </dt>
3197 <dd>
3198 <p>
3199 compares a (c)ommit and the (w)ork tree;
3200 </p>
3201 </dd>
3204 </dt>
3205 <dd>
3206 <p>
3207 compares a (c)ommit and the (i)ndex;
3208 </p>
3209 </dd>
3212 </dt>
3213 <dd>
3214 <p>
3215 compares an (o)bject and a (w)ork tree entity;
3216 </p>
3217 </dd>
3220 </dt>
3221 <dd>
3222 <p>
3224 </p>
3225 </dd>
3226 </dl></div>
3227 </dd>
3229 diff.noPrefix
3230 </dt>
3231 <dd>
3232 <p>
3234 </p>
3235 </dd>
3237 diff.srcPrefix
3238 </dt>
3239 <dd>
3240 <p>
3242 </p>
3243 </dd>
3245 diff.dstPrefix
3246 </dt>
3247 <dd>
3248 <p>
3250 </p>
3251 </dd>
3253 diff.relative
3254 </dt>
3255 <dd>
3256 <p>
3258 and show pathnames relative to the current directory.
3259 </p>
3260 </dd>
3262 diff.orderFile
3263 </dt>
3264 <dd>
3265 <p>
3266 File indicating how to order files within a diff.
3269 relative to the top of the working tree.
3270 </p>
3271 </dd>
3273 diff.renameLimit
3274 </dt>
3275 <dd>
3276 <p>
3277 The number of files to consider in the exhaustive portion of
3280 setting has no effect if rename detection is turned off.
3281 </p>
3282 </dd>
3284 diff.renames
3285 </dt>
3286 <dd>
3287 <p>
3288 Whether and how Git detects renames. If set to "false",
3289 rename detection is disabled. If set to "true", basic rename
3291 detect copies, as well. Defaults to true. Note that this
3295 </p>
3296 </dd>
3298 diff.suppressBlankEmpty
3299 </dt>
3300 <dd>
3301 <p>
3302 A boolean to inhibit the standard behavior of printing a space
3303 before each empty output line. Defaults to false.
3304 </p>
3305 </dd>
3307 diff.submodule
3308 </dt>
3309 <dd>
3310 <p>
3311 Specify the format in which differences in submodules are
3312 shown. The "short" format just shows the names of the commits
3313 at the beginning and end of the range. The "log" format lists
3314 the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code>
3315 does. The "diff" format shows an inline diff of the changed
3316 contents of the submodule. Defaults to "short".
3317 </p>
3318 </dd>
3320 diff.wordRegex
3321 </dt>
3322 <dd>
3323 <p>
3324 A POSIX Extended Regular Expression used to determine what is a "word"
3325 when performing word-by-word difference calculations. Character
3326 sequences that match the regular expression are "words", all other
3328 </p>
3329 </dd>
3332 </dt>
3333 <dd>
3334 <p>
3336 for details.
3337 </p>
3338 </dd>
3341 </dt>
3342 <dd>
3343 <p>
3344 The regular expression that the diff driver should use to
3345 recognize the hunk header. A built-in pattern may also be used.
3347 </p>
3348 </dd>
3351 </dt>
3352 <dd>
3353 <p>
3354 Set this option to true to make the diff driver treat files as
3356 </p>
3357 </dd>
3360 </dt>
3361 <dd>
3362 <p>
3363 The command that the diff driver should call to generate the
3364 text-converted version of a file. The result of the
3365 conversion is used to generate a human-readable diff. See
3367 </p>
3368 </dd>
3371 </dt>
3372 <dd>
3373 <p>
3374 The regular expression that the diff driver should use to
3376 details.
3377 </p>
3378 </dd>
3381 </dt>
3382 <dd>
3383 <p>
3384 Set this option to true to make the diff driver cache the text
3386 </p>
3390 </dt>
3391 <dd>
3392 <p>
3393 Use Araxis Merge (requires a graphical session)
3394 </p>
3395 </dd>
3398 </dt>
3399 <dd>
3400 <p>
3401 Use Beyond Compare (requires a graphical session)
3402 </p>
3403 </dd>
3406 </dt>
3407 <dd>
3408 <p>
3409 Use Beyond Compare (requires a graphical session)
3410 </p>
3411 </dd>
3414 </dt>
3415 <dd>
3416 <p>
3417 Use Beyond Compare (requires a graphical session)
3418 </p>
3419 </dd>
3422 </dt>
3423 <dd>
3424 <p>
3425 Use Code Compare (requires a graphical session)
3426 </p>
3427 </dd>
3430 </dt>
3431 <dd>
3432 <p>
3433 Use DeltaWalker (requires a graphical session)
3434 </p>
3435 </dd>
3438 </dt>
3439 <dd>
3440 <p>
3441 Use DiffMerge (requires a graphical session)
3442 </p>
3443 </dd>
3446 </dt>
3447 <dd>
3448 <p>
3449 Use Diffuse (requires a graphical session)
3450 </p>
3451 </dd>
3454 </dt>
3455 <dd>
3456 <p>
3457 Use ECMerge (requires a graphical session)
3458 </p>
3459 </dd>
3462 </dt>
3463 <dd>
3464 <p>
3465 Use Emacs' Emerge
3466 </p>
3467 </dd>
3470 </dt>
3471 <dd>
3472 <p>
3473 Use ExamDiff Pro (requires a graphical session)
3474 </p>
3475 </dd>
3478 </dt>
3479 <dd>
3480 <p>
3481 Use Guiffy’s Diff Tool (requires a graphical session)
3482 </p>
3483 </dd>
3486 </dt>
3487 <dd>
3488 <p>
3489 Use gVim (requires a graphical session)
3490 </p>
3491 </dd>
3494 </dt>
3495 <dd>
3496 <p>
3497 Use KDiff3 (requires a graphical session)
3498 </p>
3499 </dd>
3502 </dt>
3503 <dd>
3504 <p>
3505 Use Kompare (requires a graphical session)
3506 </p>
3507 </dd>
3510 </dt>
3511 <dd>
3512 <p>
3513 Use Meld (requires a graphical session)
3514 </p>
3515 </dd>
3518 </dt>
3519 <dd>
3520 <p>
3521 Use Neovim
3522 </p>
3523 </dd>
3526 </dt>
3527 <dd>
3528 <p>
3529 Use FileMerge (requires a graphical session)
3530 </p>
3531 </dd>
3534 </dt>
3535 <dd>
3536 <p>
3537 Use HelixCore P4Merge (requires a graphical session)
3538 </p>
3539 </dd>
3542 </dt>
3543 <dd>
3544 <p>
3545 Use Sublime Merge (requires a graphical session)
3546 </p>
3547 </dd>
3550 </dt>
3551 <dd>
3552 <p>
3553 Use TkDiff (requires a graphical session)
3554 </p>
3555 </dd>
3558 </dt>
3559 <dd>
3560 <p>
3561 Use Vim
3562 </p>
3563 </dd>
3566 </dt>
3567 <dd>
3568 <p>
3569 Use WinMerge (requires a graphical session)
3570 </p>
3571 </dd>
3574 </dt>
3575 <dd>
3576 <p>
3577 Use xxdiff (requires a graphical session)
3578 </p>
3579 </dd>
3580 </dl></div>
3581 </dd>
3583 diff.indentHeuristic
3584 </dt>
3585 <dd>
3586 <p>
3588 that shift diff hunk boundaries to make patches easier to read.
3589 </p>
3590 </dd>
3592 diff.algorithm
3593 </dt>
3594 <dd>
3595 <p>
3596 Choose a diff algorithm. The variants are as follows:
3597 </p>
3603 </dt>
3604 <dd>
3605 <p>
3606 The basic greedy diff algorithm. Currently, this is the default.
3607 </p>
3608 </dd>
3611 </dt>
3612 <dd>
3613 <p>
3614 Spend extra time to make sure the smallest possible diff is
3615 produced.
3616 </p>
3617 </dd>
3620 </dt>
3621 <dd>
3622 <p>
3623 Use "patience diff" algorithm when generating patches.
3624 </p>
3625 </dd>
3628 </dt>
3629 <dd>
3630 <p>
3631 This algorithm extends the patience algorithm to "support
3632 low-occurrence common elements".
3633 </p>
3634 </dd>
3635 </dl></div>
3636 </div></div>
3637 </dd>
3639 diff.wsErrorHighlight
3640 </dt>
3641 <dd>
3642 <p>
3644 lines of the diff. Multiple values are separated by comma,
3649 overrides this setting.
3650 </p>
3651 </dd>
3653 diff.colorMoved
3654 </dt>
3655 <dd>
3656 <p>
3658 in a diff are colored differently, for details of valid modes
3660 true the default color mode will be used. When set to false,
3661 moved lines are not colored.
3662 </p>
3663 </dd>
3665 diff.colorMovedWS
3666 </dt>
3667 <dd>
3668 <p>
3671 For details of valid modes see <em>--color-moved-ws</em> in <a href="git-diff.html">git-diff(1)</a>.
3672 </p>
3673 </dd>
3674 </dl></div>
3675 </div>
3676 </div>
3687 </div>
3688 </div>
3693 </div>
3694 </div>
3695 </div>
3699 Last updated
3701 </div>
3702 </div>
3703 </body>
3704 </html>