| blob | c92ade2d21803499e88ad0f6ee77a56454ae97a9 |
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-show(1) Manual Page
739 </h1>
742 <p>git-show -
743 Show various types of objects
744 </p>
745 </div>
746 </div>
754 </div></div>
755 </div>
756 </div>
762 presents the merge commit in a special format as produced by
764 <div class="paragraph"><p>For tags, it shows the tag message and the referenced objects.</p></div>
766 with --name-only).</p></div>
769 control how the changes the commit introduces are shown.</p></div>
770 <div class="paragraph"><p>This manual page describes only the most frequently used options.</p></div>
771 </div>
772 </div>
779 </dt>
780 <dd>
781 <p>
783 For a more complete list of ways to spell object names, see
785 </p>
786 </dd>
789 </dt>
792 </dt>
793 <dd>
794 <p>
795 Pretty-print the contents of the commit logs in a given format,
797 <em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:<string></em>
801 </p>
803 format. When <em>=<format></em> part is omitted, it defaults to <em>medium</em>.</p></div>
806 </dd>
808 --abbrev-commit
809 </dt>
810 <dd>
811 <p>
812 Instead of showing the full 40-byte hexadecimal commit object
813 name, show a prefix that names the object uniquely.
814 "--abbrev=<n>" (which also modifies diff output, if it is displayed)
815 option can be used to specify the minimum length of the prefix.
816 </p>
819 </dd>
821 --no-abbrev-commit
822 </dt>
823 <dd>
824 <p>
825 Show the full 40-byte hexadecimal commit object name. This negates
828 </p>
829 </dd>
831 --oneline
832 </dt>
833 <dd>
834 <p>
835 This is a shorthand for "--pretty=oneline --abbrev-commit"
836 used together.
837 </p>
838 </dd>
841 </dt>
842 <dd>
843 <p>
844 Commit objects record the character encoding used for the log message
845 in their encoding header; this option can be used to tell the
846 command to re-code the commit log message in the encoding
847 preferred by the user. For non plumbing commands this
848 defaults to UTF-8. Note that if an object claims to be encoded
850 verbatim; this means that invalid sequences in the original
851 commit may be copied to the output. Likewise, if iconv(3) fails
852 to convert the commit, we will quietly output the original
853 object verbatim.
854 </p>
855 </dd>
858 </dt>
860 --expand-tabs
861 </dt>
863 --no-expand-tabs
864 </dt>
865 <dd>
866 <p>
867 Perform a tab expansion (replace each tab with enough spaces
869 in the log message before showing it in the output.
872 which disables tab expansion.
873 </p>
877 </dd>
880 </dt>
881 <dd>
882 <p>
884 commit, when showing the commit log message. This is the default
886 there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given
887 on the command line.
888 </p>
891 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
892 <div class="paragraph"><p>With an optional <em><ref></em> argument, use the ref to find the notes
893 to display. The ref can specify the full refname when it begins
894 with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
897 being displayed. Examples: "--notes=foo" will show only notes from
900 </dd>
902 --no-notes
903 </dt>
904 <dd>
905 <p>
907 resetting the list of notes refs from which notes are shown.
908 Options are parsed in the order given on the command line, so e.g.
909 "--notes --notes=foo --no-notes --notes=bar" will only show notes
910 from "refs/notes/bar".
911 </p>
912 </dd>
914 --show-notes-by-default
915 </dt>
916 <dd>
917 <p>
918 Show the default notes unless options for displaying specific
919 notes are given.
920 </p>
921 </dd>
924 </dt>
926 --[no-]standard-notes
927 </dt>
928 <dd>
929 <p>
930 These options are deprecated. Use the above --notes/--no-notes
931 options instead.
932 </p>
933 </dd>
935 --show-signature
936 </dt>
937 <dd>
938 <p>
939 Check the validity of a signed commit object by passing the signature
941 </p>
942 </dd>
943 </dl></div>
944 </div>
945 </div>
952 "Merge: " and the hashes of ancestral commits are printed,
953 separated by spaces. Note that the listed commits may not
955 have limited your view of history: for example, if you are
956 only interested in changes related to a certain directory or
957 file.</p></div>
960 config option to either another format name, or a
963 built-in formats:</p></div>
965 <li>
966 <p>
968 </p>
972 </div></div>
974 </li>
975 <li>
976 <p>
978 </p>
983 </div></div>
987 </div></div>
988 </li>
989 <li>
990 <p>
992 </p>
998 </div></div>
1002 </div></div>
1006 </div></div>
1007 </li>
1008 <li>
1009 <p>
1011 </p>
1017 </div></div>
1021 </div></div>
1025 </div></div>
1026 </li>
1027 <li>
1028 <p>
1030 </p>
1038 </div></div>
1042 </div></div>
1046 </div></div>
1047 </li>
1048 <li>
1049 <p>
1051 </p>
1055 </div></div>
1056 <div class="paragraph"><p>This format is used to refer to another commit in a commit message and
1060 placeholders, its output is not affected by other options like
1062 </li>
1063 <li>
1064 <p>
1066 </p>
1073 </div></div>
1077 </div></div>
1078 </li>
1079 <li>
1080 <p>
1082 </p>
1083 <div class="paragraph"><p>Like <em>email</em>, but lines in the commit message starting with "From "
1085 confused as starting a new commit.</p></div>
1086 </li>
1087 <li>
1088 <p>
1090 </p>
1092 stored in the commit object. Notably, the hashes are
1093 displayed in full, regardless of whether --abbrev or
1095 true parent commits, without taking grafts or history
1096 simplification into account. Note that this format affects the way
1097 commits are displayed, but not the way the diff is shown e.g. with
1100 </li>
1101 <li>
1102 <p>
1104 </p>
1105 <div class="paragraph"><p>The <em>format:<format-string></em> format allows you to specify which information
1106 you want to show. It works a little bit like printf format,
1109 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1110 would show something like this:</p></div>
1114 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</code></pre>
1115 </div></div>
1118 <li>
1119 <p>
1120 Placeholders that expand to a single literal character:
1121 </p>
1125 </dt>
1126 <dd>
1127 <p>
1128 newline
1129 </p>
1130 </dd>
1133 </dt>
1134 <dd>
1135 <p>
1137 </p>
1138 </dd>
1141 </dt>
1142 <dd>
1143 <p>
1145 byte with the hexadecimal digits' value (we will call this
1146 "literal formatting code" in the rest of this document).
1147 </p>
1148 </dd>
1149 </dl></div>
1150 </li>
1151 <li>
1152 <p>
1153 Placeholders that affect formatting of later placeholders:
1154 </p>
1158 </dt>
1159 <dd>
1160 <p>
1161 switch color to red
1162 </p>
1163 </dd>
1166 </dt>
1167 <dd>
1168 <p>
1169 switch color to green
1170 </p>
1171 </dd>
1174 </dt>
1175 <dd>
1176 <p>
1177 switch color to blue
1178 </p>
1179 </dd>
1182 </dt>
1183 <dd>
1184 <p>
1185 reset color
1186 </p>
1187 </dd>
1190 </dt>
1191 <dd>
1192 <p>
1193 color specification, as described under Values in the
1195 default, colors are shown only when enabled for log output
1201 not otherwise enabled (though consider just using
1203 including this format and anything else git might color).
1205 on the next placeholders until the color is switched
1206 again.
1207 </p>
1208 </dd>
1211 </dt>
1212 <dd>
1213 <p>
1215 </p>
1216 </dd>
1219 </dt>
1220 <dd>
1221 <p>
1222 switch line wrapping, like the -w option of
1224 </p>
1225 </dd>
1228 </dt>
1229 <dd>
1230 <p>
1231 make the next placeholder take at
1232 least N column widths, padding spaces on
1233 the right if necessary. Optionally
1237 N columns.
1238 Note 1: that truncating
1240 Note 2: spaces around the N and M (see below)
1241 values are optional.
1242 Note 3: Emojis and other wide characters
1243 will take two display columns, which may
1244 over-run column boundaries.
1245 Note 4: decomposed character combining marks
1246 may be misplaced at padding boundaries.
1247 </p>
1248 </dd>
1251 </dt>
1252 <dd>
1253 <p>
1254 make the next placeholder take at least until Mth
1255 display column, padding spaces on the right if necessary.
1256 Use negative M values for column positions measured
1257 from the right hand edge of the terminal window.
1258 </p>
1259 </dd>
1262 </dt>
1263 <dd>
1264 <p>
1266 but padding spaces on the left
1267 </p>
1268 </dd>
1271 </dt>
1272 <dd>
1273 <p>
1275 respectively, except that if the next
1276 placeholder takes more spaces than given and
1277 there are spaces on its left, use those
1278 spaces
1279 </p>
1280 </dd>
1283 </dt>
1284 <dd>
1285 <p>
1287 respectively, but padding both sides
1288 (i.e. the text is centered)
1289 </p>
1290 </dd>
1291 </dl></div>
1292 </li>
1293 <li>
1294 <p>
1295 Placeholders that expand to information extracted from the commit:
1296 </p>
1300 </dt>
1301 <dd>
1302 <p>
1303 commit hash
1304 </p>
1305 </dd>
1308 </dt>
1309 <dd>
1310 <p>
1311 abbreviated commit hash
1312 </p>
1313 </dd>
1316 </dt>
1317 <dd>
1318 <p>
1319 tree hash
1320 </p>
1321 </dd>
1324 </dt>
1325 <dd>
1326 <p>
1327 abbreviated tree hash
1328 </p>
1329 </dd>
1332 </dt>
1333 <dd>
1334 <p>
1335 parent hashes
1336 </p>
1337 </dd>
1340 </dt>
1341 <dd>
1342 <p>
1343 abbreviated parent hashes
1344 </p>
1345 </dd>
1348 </dt>
1349 <dd>
1350 <p>
1351 author name
1352 </p>
1353 </dd>
1356 </dt>
1357 <dd>
1358 <p>
1361 </p>
1362 </dd>
1365 </dt>
1366 <dd>
1367 <p>
1368 author email
1369 </p>
1370 </dd>
1373 </dt>
1374 <dd>
1375 <p>
1378 </p>
1379 </dd>
1382 </dt>
1383 <dd>
1384 <p>
1386 </p>
1387 </dd>
1390 </dt>
1391 <dd>
1392 <p>
1395 </p>
1396 </dd>
1399 </dt>
1400 <dd>
1401 <p>
1402 author date (format respects --date= option)
1403 </p>
1404 </dd>
1407 </dt>
1408 <dd>
1409 <p>
1410 author date, RFC2822 style
1411 </p>
1412 </dd>
1415 </dt>
1416 <dd>
1417 <p>
1418 author date, relative
1419 </p>
1420 </dd>
1423 </dt>
1424 <dd>
1425 <p>
1426 author date, UNIX timestamp
1427 </p>
1428 </dd>
1431 </dt>
1432 <dd>
1433 <p>
1434 author date, ISO 8601-like format
1435 </p>
1436 </dd>
1439 </dt>
1440 <dd>
1441 <p>
1442 author date, strict ISO 8601 format
1443 </p>
1444 </dd>
1447 </dt>
1448 <dd>
1449 <p>
1451 </p>
1452 </dd>
1455 </dt>
1456 <dd>
1457 <p>
1460 </p>
1461 </dd>
1464 </dt>
1465 <dd>
1466 <p>
1467 committer name
1468 </p>
1469 </dd>
1472 </dt>
1473 <dd>
1474 <p>
1475 committer name (respecting .mailmap, see
1477 </p>
1478 </dd>
1481 </dt>
1482 <dd>
1483 <p>
1484 committer email
1485 </p>
1486 </dd>
1489 </dt>
1490 <dd>
1491 <p>
1492 committer email (respecting .mailmap, see
1494 </p>
1495 </dd>
1498 </dt>
1499 <dd>
1500 <p>
1502 </p>
1503 </dd>
1506 </dt>
1507 <dd>
1508 <p>
1511 </p>
1512 </dd>
1515 </dt>
1516 <dd>
1517 <p>
1518 committer date (format respects --date= option)
1519 </p>
1520 </dd>
1523 </dt>
1524 <dd>
1525 <p>
1526 committer date, RFC2822 style
1527 </p>
1528 </dd>
1531 </dt>
1532 <dd>
1533 <p>
1534 committer date, relative
1535 </p>
1536 </dd>
1539 </dt>
1540 <dd>
1541 <p>
1542 committer date, UNIX timestamp
1543 </p>
1544 </dd>
1547 </dt>
1548 <dd>
1549 <p>
1550 committer date, ISO 8601-like format
1551 </p>
1552 </dd>
1555 </dt>
1556 <dd>
1557 <p>
1558 committer date, strict ISO 8601 format
1559 </p>
1560 </dd>
1563 </dt>
1564 <dd>
1565 <p>
1567 </p>
1568 </dd>
1571 </dt>
1572 <dd>
1573 <p>
1576 </p>
1577 </dd>
1580 </dt>
1581 <dd>
1582 <p>
1584 </p>
1585 </dd>
1588 </dt>
1589 <dd>
1590 <p>
1592 </p>
1593 </dd>
1596 </dt>
1597 <dd>
1598 <p>
1600 colon and zero or more comma-separated options. Option values may contain
1603 </p>
1605 <li>
1606 <p>
1607 <em>prefix=<value></em>: Shown before the list of ref names. Defaults to " <code>(</code>".
1608 </p>
1609 </li>
1610 <li>
1611 <p>
1612 <em>suffix=<value></em>: Shown after the list of ref names. Defaults to "<code>)</code>".
1613 </p>
1614 </li>
1615 <li>
1616 <p>
1618 </p>
1619 </li>
1620 <li>
1621 <p>
1623 Defaults to " <code>-></code> ".
1624 </p>
1625 </li>
1626 <li>
1627 <p>
1629 </p>
1630 </li>
1631 </ul></div>
1633 or tag annotations, and spaces as separators:</p></div>
1635 </dd>
1638 </dt>
1639 <dd>
1640 <p>
1643 zero or more comma-separated options. Descriptions can be inconsistent when
1644 tags are added or removed at the same time.
1645 </p>
1647 <li>
1648 <p>
1650 consider lightweight tags as well.
1651 </p>
1652 </li>
1653 <li>
1654 <p>
1656 (which will vary according to the number of objects in the repository with a
1658 digits as needed to form a unique object name.
1659 </p>
1660 </li>
1661 <li>
1662 <p>
1665 </p>
1666 </li>
1667 <li>
1668 <p>
1671 </p>
1672 </li>
1673 </ul></div>
1674 </dd>
1677 </dt>
1678 <dd>
1679 <p>
1680 ref name given on the command line by which the commit was reached
1682 </p>
1683 </dd>
1686 </dt>
1687 <dd>
1688 <p>
1689 encoding
1690 </p>
1691 </dd>
1694 </dt>
1695 <dd>
1696 <p>
1697 subject
1698 </p>
1699 </dd>
1702 </dt>
1703 <dd>
1704 <p>
1705 sanitized subject line, suitable for a filename
1706 </p>
1707 </dd>
1710 </dt>
1711 <dd>
1712 <p>
1713 body
1714 </p>
1715 </dd>
1718 </dt>
1719 <dd>
1720 <p>
1721 raw body (unwrapped subject and body)
1722 </p>
1723 </dd>
1726 </dt>
1727 <dd>
1728 <p>
1729 commit notes
1730 </p>
1731 </dd>
1734 </dt>
1735 <dd>
1736 <p>
1737 raw verification message from GPG for a signed commit
1738 </p>
1739 </dd>
1742 </dt>
1743 <dd>
1744 <p>
1745 show "G" for a good (valid) signature,
1746 "B" for a bad signature,
1747 "U" for a good signature with unknown validity,
1748 "X" for a good signature that has expired,
1749 "Y" for a good signature made by an expired key,
1750 "R" for a good signature made by a revoked key,
1751 "E" if the signature cannot be checked (e.g. missing key)
1752 and "N" for no signature
1753 </p>
1754 </dd>
1757 </dt>
1758 <dd>
1759 <p>
1760 show the name of the signer for a signed commit
1761 </p>
1762 </dd>
1765 </dt>
1766 <dd>
1767 <p>
1768 show the key used to sign a signed commit
1769 </p>
1770 </dd>
1773 </dt>
1774 <dd>
1775 <p>
1776 show the fingerprint of the key used to sign a signed commit
1777 </p>
1778 </dd>
1781 </dt>
1782 <dd>
1783 <p>
1784 show the fingerprint of the primary key whose subkey was used
1785 to sign a signed commit
1786 </p>
1787 </dd>
1790 </dt>
1791 <dd>
1792 <p>
1793 show the trust level for the key used to sign a signed commit
1794 </p>
1795 </dd>
1798 </dt>
1799 <dd>
1800 <p>
1802 minutes ago}</code>; the format follows the rules described for the
1806 </p>
1807 </dd>
1810 </dt>
1811 <dd>
1812 <p>
1814 portion is shortened for human readability (so
1816 </p>
1817 </dd>
1820 </dt>
1821 <dd>
1822 <p>
1823 reflog identity name
1824 </p>
1825 </dd>
1828 </dt>
1829 <dd>
1830 <p>
1831 reflog identity name (respecting .mailmap, see
1833 </p>
1834 </dd>
1837 </dt>
1838 <dd>
1839 <p>
1840 reflog identity email
1841 </p>
1842 </dd>
1845 </dt>
1846 <dd>
1847 <p>
1848 reflog identity email (respecting .mailmap, see
1850 </p>
1851 </dd>
1854 </dt>
1855 <dd>
1856 <p>
1857 reflog subject
1858 </p>
1859 </dd>
1862 </dt>
1863 <dd>
1864 <p>
1865 display the trailers of the body as interpreted by
1866 <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
1867 a colon and zero or more comma-separated options. If any option is provided
1868 multiple times, the last occurrence wins.
1869 </p>
1871 <li>
1872 <p>
1874 case-insensitively and trailing colon is optional. If option is
1875 given multiple times trailer lines matching any of the keys are
1877 non-trailer lines in the trailer block are hidden. If that is not
1881 </p>
1882 </li>
1883 <li>
1884 <p>
1886 block should be included.
1887 </p>
1888 </li>
1889 <li>
1890 <p>
1892 lines. When this option is not given each trailer line is
1894 the literal formatting codes described above. To use comma as
1897 shows all trailer lines whose key is "Ticket" separated by a comma
1898 and a space.
1899 </p>
1900 </li>
1901 <li>
1902 <p>
1903 <em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code>
1904 option was given. E.g.,
1906 </p>
1907 </li>
1908 <li>
1909 <p>
1911 </p>
1912 </li>
1913 <li>
1914 <p>
1916 </p>
1917 </li>
1918 <li>
1919 <p>
1921 trailer lines. When this option is not given each trailer key-value
1922 pair is separated by ": ". Otherwise it shares the same semantics
1924 </p>
1925 </li>
1926 </ul></div>
1927 </dd>
1928 </dl></div>
1929 </li>
1930 </ul></div>
1931 </li>
1932 </ul></div>
1934 <table><tr>
1937 </td>
1940 insert an empty string unless we are traversing reflog entries (e.g., by
1941 <code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
1943 line.</td>
1944 </tr></table>
1945 </div>
1946 <div class="paragraph"><p>The boolean options accept an optional value <code>[=<bool-value>]</code>. The values
1947 <code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
1950 <div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
1951 is inserted immediately before the expansion if and only if the
1952 placeholder expands to a non-empty string.</p></div>
1953 <div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
1954 line-feeds immediately preceding the expansion are deleted if and only if the
1955 placeholder expands to an empty string.</p></div>
1957 is inserted immediately before the expansion if and only if the
1958 placeholder expands to a non-empty string.</p></div>
1960 <li>
1961 <p>
1963 </p>
1964 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1966 other words, each commit has the message terminator character (usually a
1967 newline) appended, rather than a separator placed between entries.
1968 This means that the final entry of a single-line format will be properly
1969 terminated with a new line, just as the "oneline" format does.
1970 For example:</p></div>
1974 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1975 4da45be
1976 7134973 -- NO NEWLINE
1979 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1980 4da45be
1982 </div></div>
1983 <div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
1985 equivalent:</p></div>
1990 </div></div>
1991 </li>
1992 </ul></div>
1993 </div>
1994 </div>
1998 <div class="paragraph"><p>The options below can be used to change the way <code>git show</code> generates
1999 diff output.</p></div>
2002 -p
2003 </dt>
2005 -u
2006 </dt>
2008 --patch
2009 </dt>
2010 <dd>
2011 <p>
2013 </p>
2014 </dd>
2016 -s
2017 </dt>
2019 --no-patch
2020 </dt>
2021 <dd>
2022 <p>
2023 Suppress all output from the diff machinery. Useful for
2025 squelch their output, or to cancel the effect of options like
2027 </p>
2028 </dd>
2030 -m
2031 </dt>
2032 <dd>
2033 <p>
2034 Show diffs for merge commits in the default format. This is
2037 </p>
2038 </dd>
2040 -c
2041 </dt>
2042 <dd>
2043 <p>
2044 Produce combined diff output for merge commits.
2046 </p>
2047 </dd>
2049 --cc
2050 </dt>
2051 <dd>
2052 <p>
2053 Produce dense combined diff output for merge commits.
2055 </p>
2056 </dd>
2058 --dd
2059 </dt>
2060 <dd>
2061 <p>
2062 Produce diff with respect to first parent for both merge and
2063 regular commits.
2065 </p>
2066 </dd>
2068 --remerge-diff
2069 </dt>
2070 <dd>
2071 <p>
2072 Produce remerge-diff output for merge commits.
2074 </p>
2075 </dd>
2077 --no-diff-merges
2078 </dt>
2079 <dd>
2080 <p>
2082 </p>
2083 </dd>
2086 </dt>
2087 <dd>
2088 <p>
2089 Specify diff format to be used for merge commits. Default is
2092 </p>
2098 off, none
2099 </dt>
2100 <dd>
2101 <p>
2102 Disable output of diffs for merge commits. Useful to override
2103 implied value.
2104 </p>
2105 </dd>
2107 on, m
2108 </dt>
2109 <dd>
2110 <p>
2111 Make diff output for merge commits to be shown in the default
2112 format. The default format can be changed using
2115 </p>
2116 </dd>
2118 first-parent, 1
2119 </dt>
2120 <dd>
2121 <p>
2122 Show full diff with respect to first parent. This is the same
2124 </p>
2125 </dd>
2127 separate
2128 </dt>
2129 <dd>
2130 <p>
2131 Show full diff with respect to each of parents.
2132 Separate log entry and diff is generated for each parent.
2133 </p>
2134 </dd>
2136 combined, c
2137 </dt>
2138 <dd>
2139 <p>
2140 Show differences from each of the parents to the merge
2141 result simultaneously instead of showing pairwise diff between
2142 a parent and the result one at a time. Furthermore, it lists
2143 only files which were modified from all parents.
2144 </p>
2145 </dd>
2147 dense-combined, cc
2148 </dt>
2149 <dd>
2150 <p>
2152 by omitting uninteresting hunks whose contents in the parents
2153 have only two variants and the merge result picks one of them
2154 without modification.
2155 </p>
2156 </dd>
2158 remerge, r
2159 </dt>
2160 <dd>
2161 <p>
2162 Remerge two-parent merge commits to create a temporary tree
2163 object—potentially containing files with conflict markers
2164 and such. A diff is then shown between that temporary tree
2165 and the actual merge commit.
2166 </p>
2167 <div class="paragraph"><p>The output emitted when this option is used is subject to change, and
2168 so is its interaction with other options (unless explicitly
2169 documented).</p></div>
2170 </dd>
2171 </dl></div>
2172 </div></div>
2173 </dd>
2175 --combined-all-paths
2176 </dt>
2177 <dd>
2178 <p>
2179 This flag causes combined diffs (used for merge commits) to
2180 list the name of the file from all parents. It thus only has
2182 is likely only useful if filename changes are detected (i.e.
2183 when either rename or copy detection have been requested).
2184 </p>
2185 </dd>
2188 </dt>
2191 </dt>
2192 <dd>
2193 <p>
2195 the usual three.
2197 </p>
2198 </dd>
2201 </dt>
2202 <dd>
2203 <p>
2204 Output to a specific file instead of stdout.
2205 </p>
2206 </dd>
2209 </dt>
2212 </dt>
2215 </dt>
2216 <dd>
2217 <p>
2218 Specify the character used to indicate new, old or context
2220 ' ' respectively.
2221 </p>
2222 </dd>
2224 --raw
2225 </dt>
2226 <dd>
2227 <p>
2228 For each commit, show a summary of changes using the raw diff
2229 format. See the "RAW OUTPUT FORMAT" section of
2231 itself in raw format, which you can achieve with
2233 </p>
2234 </dd>
2236 --patch-with-raw
2237 </dt>
2238 <dd>
2239 <p>
2241 </p>
2242 </dd>
2244 -t
2245 </dt>
2246 <dd>
2247 <p>
2248 Show the tree objects in the diff output.
2249 </p>
2250 </dd>
2252 --indent-heuristic
2253 </dt>
2254 <dd>
2255 <p>
2256 Enable the heuristic that shifts diff hunk boundaries to make patches
2257 easier to read. This is the default.
2258 </p>
2259 </dd>
2261 --no-indent-heuristic
2262 </dt>
2263 <dd>
2264 <p>
2265 Disable the indent heuristic.
2266 </p>
2267 </dd>
2269 --minimal
2270 </dt>
2271 <dd>
2272 <p>
2273 Spend extra time to make sure the smallest possible
2274 diff is produced.
2275 </p>
2276 </dd>
2278 --patience
2279 </dt>
2280 <dd>
2281 <p>
2282 Generate a diff using the "patience diff" algorithm.
2283 </p>
2284 </dd>
2286 --histogram
2287 </dt>
2288 <dd>
2289 <p>
2290 Generate a diff using the "histogram diff" algorithm.
2291 </p>
2292 </dd>
2295 </dt>
2296 <dd>
2297 <p>
2298 Generate a diff using the "anchored diff" algorithm.
2299 </p>
2301 <div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
2302 and starts with this text, this algorithm attempts to prevent it from
2303 appearing as a deletion or addition in the output. It uses the "patience
2305 </dd>
2307 --diff-algorithm={patience|minimal|histogram|myers}
2308 </dt>
2309 <dd>
2310 <p>
2311 Choose a diff algorithm. The variants are as follows:
2312 </p>
2318 </dt>
2319 <dd>
2320 <p>
2321 The basic greedy diff algorithm. Currently, this is the default.
2322 </p>
2323 </dd>
2326 </dt>
2327 <dd>
2328 <p>
2329 Spend extra time to make sure the smallest possible diff is
2330 produced.
2331 </p>
2332 </dd>
2335 </dt>
2336 <dd>
2337 <p>
2338 Use "patience diff" algorithm when generating patches.
2339 </p>
2340 </dd>
2343 </dt>
2344 <dd>
2345 <p>
2346 This algorithm extends the patience algorithm to "support
2347 low-occurrence common elements".
2348 </p>
2349 </dd>
2350 </dl></div>
2351 </div></div>
2352 <div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
2353 non-default value and want to use the default one, then you
2355 </dd>
2358 </dt>
2359 <dd>
2360 <p>
2361 Generate a diffstat. By default, as much space as necessary
2362 will be used for the filename part, and the rest for the graph
2363 part. Maximum width defaults to terminal width, or 80 columns
2364 if not connected to a terminal, and can be overridden by
2375 </p>
2376 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
2377 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
2378 </dd>
2380 --compact-summary
2381 </dt>
2382 <dd>
2383 <p>
2384 Output a condensed summary of extended header information such
2387 or removing executable bit respectively) in diffstat. The
2388 information is put between the filename part and the graph
2390 </p>
2391 </dd>
2393 --numstat
2394 </dt>
2395 <dd>
2396 <p>
2398 deleted lines in decimal notation and pathname without
2399 abbreviation, to make it more machine friendly. For
2402 </p>
2403 </dd>
2405 --shortstat
2406 </dt>
2407 <dd>
2408 <p>
2410 number of modified files, as well as number of added and deleted
2411 lines.
2412 </p>
2413 </dd>
2416 </dt>
2419 </dt>
2420 <dd>
2421 <p>
2422 Output the distribution of relative amount of changes for each
2424 passing it a comma separated list of parameters.
2427 The following parameters are available:
2428 </p>
2434 </dt>
2435 <dd>
2436 <p>
2437 Compute the dirstat numbers by counting the lines that have been
2438 removed from the source, or added to the destination. This ignores
2439 the amount of pure code movements within a file. In other words,
2440 rearranging lines in a file is not counted as much as other changes.
2441 This is the default behavior when no parameter is given.
2442 </p>
2443 </dd>
2446 </dt>
2447 <dd>
2448 <p>
2449 Compute the dirstat numbers by doing the regular line-based diff
2450 analysis, and summing the removed/added line counts. (For binary
2451 files, count 64-byte chunks instead, since binary files have no
2454 lines within a file as much as other changes. The resulting output
2456 </p>
2457 </dd>
2460 </dt>
2461 <dd>
2462 <p>
2463 Compute the dirstat numbers by counting the number of files changed.
2464 Each changed file counts equally in the dirstat analysis. This is
2466 not have to look at the file contents at all.
2467 </p>
2468 </dd>
2471 </dt>
2472 <dd>
2473 <p>
2474 Count changes in a child directory for the parent directory as well.
2476 reported may exceed 100%. The default (non-cumulative) behavior can
2478 </p>
2479 </dd>
2482 </dt>
2483 <dd>
2484 <p>
2485 An integer parameter specifies a cut-off percent (3% by default).
2486 Directories contributing less than this percentage of the changes
2487 are not shown in the output.
2488 </p>
2489 </dd>
2490 </dl></div>
2491 </div></div>
2493 directories with less than 10% of the total amount of changed files,
2494 and accumulating child directory counts in the parent directories:
2496 </dd>
2498 --cumulative
2499 </dt>
2500 <dd>
2501 <p>
2502 Synonym for --dirstat=cumulative
2503 </p>
2504 </dd>
2507 </dt>
2508 <dd>
2509 <p>
2511 </p>
2512 </dd>
2514 --summary
2515 </dt>
2516 <dd>
2517 <p>
2518 Output a condensed summary of extended header information
2519 such as creations, renames and mode changes.
2520 </p>
2521 </dd>
2523 --patch-with-stat
2524 </dt>
2525 <dd>
2526 <p>
2528 </p>
2529 </dd>
2531 -z
2532 </dt>
2533 <dd>
2534 <p>
2535 Separate the commits with NULs instead of newlines.
2536 </p>
2537 <div class="paragraph"><p>Also, when <code>--raw</code> or <code>--numstat</code> has been given, do not munge
2538 pathnames and use NULs as output field terminators.</p></div>
2539 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
2542 </dd>
2544 --name-only
2545 </dt>
2546 <dd>
2547 <p>
2548 Show only names of changed files. The file names are often encoded in UTF-8.
2549 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
2550 manual page.
2551 </p>
2552 </dd>
2554 --name-status
2555 </dt>
2556 <dd>
2557 <p>
2558 Show only names and status of changed files. See the description
2561 </p>
2562 </dd>
2565 </dt>
2566 <dd>
2567 <p>
2568 Specify how differences in submodules are shown. When specifying
2570 shows the names of the commits at the beginning and end of the range.
2572 format is used. This format lists the commits in the range like
2573 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
2575 inline diff of the changes in the submodule contents between the
2577 if the config option is unset.
2578 </p>
2579 </dd>
2582 </dt>
2583 <dd>
2584 <p>
2585 Show colored diff.
2586 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
2587 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
2588 </p>
2589 </dd>
2591 --no-color
2592 </dt>
2593 <dd>
2594 <p>
2595 Turn off colored diff.
2597 </p>
2598 </dd>
2601 </dt>
2602 <dd>
2603 <p>
2604 Moved lines of code are colored differently.
2607 The mode must be one of:
2608 </p>
2613 no
2614 </dt>
2615 <dd>
2616 <p>
2617 Moved lines are not highlighted.
2618 </p>
2619 </dd>
2621 default
2622 </dt>
2623 <dd>
2624 <p>
2626 in the future.
2627 </p>
2628 </dd>
2630 plain
2631 </dt>
2632 <dd>
2633 <p>
2634 Any line that is added in one location and was removed
2637 that are added somewhere else in the diff. This mode picks up any
2638 moved line, but it is not very useful in a review to determine
2639 if a block of code was moved without permutation.
2640 </p>
2641 </dd>
2643 blocks
2644 </dt>
2645 <dd>
2646 <p>
2647 Blocks of moved text of at least 20 alphanumeric characters
2648 are detected greedily. The detected blocks are
2650 Adjacent blocks cannot be told apart.
2651 </p>
2652 </dd>
2654 zebra
2655 </dt>
2656 <dd>
2657 <p>
2661 the two colors indicates that a new block was detected.
2662 </p>
2663 </dd>
2665 dimmed-zebra
2666 </dt>
2667 <dd>
2668 <p>
2670 of moved code is performed. The bordering lines of two adjacent
2671 blocks are considered interesting, the rest is uninteresting.
2673 </p>
2674 </dd>
2675 </dl></div>
2676 </div></div>
2677 </dd>
2679 --no-color-moved
2680 </dt>
2681 <dd>
2682 <p>
2683 Turn off move detection. This can be used to override configuration
2685 </p>
2686 </dd>
2689 </dt>
2690 <dd>
2691 <p>
2692 This configures how whitespace is ignored when performing the
2694 These modes can be given as a comma separated list:
2695 </p>
2700 no
2701 </dt>
2702 <dd>
2703 <p>
2704 Do not ignore whitespace when performing move detection.
2705 </p>
2706 </dd>
2708 ignore-space-at-eol
2709 </dt>
2710 <dd>
2711 <p>
2712 Ignore changes in whitespace at EOL.
2713 </p>
2714 </dd>
2716 ignore-space-change
2717 </dt>
2718 <dd>
2719 <p>
2720 Ignore changes in amount of whitespace. This ignores whitespace
2721 at line end, and considers all other sequences of one or
2722 more whitespace characters to be equivalent.
2723 </p>
2724 </dd>
2726 ignore-all-space
2727 </dt>
2728 <dd>
2729 <p>
2730 Ignore whitespace when comparing lines. This ignores differences
2731 even if one line has whitespace where the other line has none.
2732 </p>
2733 </dd>
2735 allow-indentation-change
2736 </dt>
2737 <dd>
2738 <p>
2739 Initially ignore any whitespace in the move detection, then
2740 group the moved code blocks only into a block if the change in
2741 whitespace is the same per line. This is incompatible with the
2742 other modes.
2743 </p>
2744 </dd>
2745 </dl></div>
2746 </div></div>
2747 </dd>
2749 --no-color-moved-ws
2750 </dt>
2751 <dd>
2752 <p>
2753 Do not ignore whitespace when performing move detection. This can be
2754 used to override configuration settings. It is the same as
2756 </p>
2757 </dd>
2760 </dt>
2761 <dd>
2762 <p>
2764 By default, words are delimited by whitespace; see
2766 must be one of:
2767 </p>
2772 color
2773 </dt>
2774 <dd>
2775 <p>
2777 </p>
2778 </dd>
2780 plain
2781 </dt>
2782 <dd>
2783 <p>
2785 attempts to escape the delimiters if they appear in the input,
2786 so the output may be ambiguous.
2787 </p>
2788 </dd>
2790 porcelain
2791 </dt>
2792 <dd>
2793 <p>
2794 Use a special line-based format intended for script
2795 consumption. Added/removed/unchanged runs are printed in the
2797 character at the beginning of the line and extending to the
2798 end of the line. Newlines in the input are represented by a
2800 </p>
2801 </dd>
2803 none
2804 </dt>
2805 <dd>
2806 <p>
2807 Disable word diff again.
2808 </p>
2809 </dd>
2810 </dl></div>
2811 </div></div>
2813 highlight the changed parts in all modes if enabled.</p></div>
2814 </dd>
2817 </dt>
2818 <dd>
2819 <p>
2821 runs of non-whitespace to be a word. Also implies
2823 </p>
2826 considered whitespace and ignored(!) for the purposes of finding
2828 expression to make sure that it matches all non-whitespace characters.
2829 A match that contains a newline is silently truncated(!) at the
2830 newline.</p></div>
2831 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
2832 and, correspondingly, show differences character by character.</p></div>
2833 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
2834 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
2835 overrides any diff driver or configuration setting. Diff drivers
2836 override configuration settings.</p></div>
2837 </dd>
2840 </dt>
2841 <dd>
2842 <p>
2845 </p>
2846 </dd>
2848 --no-renames
2849 </dt>
2850 <dd>
2851 <p>
2852 Turn off rename detection, even when the configuration
2853 file gives the default to do so.
2854 </p>
2855 </dd>
2857 --[no-]rename-empty
2858 </dt>
2859 <dd>
2860 <p>
2861 Whether to use empty blobs as rename source.
2862 </p>
2863 </dd>
2865 --check
2866 </dt>
2867 <dd>
2868 <p>
2869 Warn if changes introduce conflict markers or whitespace errors.
2871 configuration. By default, trailing whitespaces (including
2872 lines that consist solely of whitespaces) and a space character
2873 that is immediately followed by a tab character inside the
2874 initial indent of the line are considered whitespace errors.
2875 Exits with non-zero status if problems are found. Not compatible
2876 with --exit-code.
2877 </p>
2878 </dd>
2881 </dt>
2882 <dd>
2883 <p>
2885 lines of the diff. Multiple values are separated by comma,
2888 this option is not given, and the configuration variable
2892 </p>
2893 </dd>
2895 --full-index
2896 </dt>
2897 <dd>
2898 <p>
2899 Instead of the first handful of characters, show the full
2900 pre- and post-image blob object names on the "index"
2901 line when generating patch format output.
2902 </p>
2903 </dd>
2905 --binary
2906 </dt>
2907 <dd>
2908 <p>
2912 </p>
2913 </dd>
2916 </dt>
2917 <dd>
2918 <p>
2919 Instead of showing the full 40-byte hexadecimal object
2920 name in diff-raw format output and diff-tree header
2922 hexdigits long that uniquely refers the object.
2927 </p>
2928 </dd>
2931 </dt>
2934 </dt>
2935 <dd>
2936 <p>
2937 Break complete rewrite changes into pairs of delete and
2938 create. This serves two purposes:
2939 </p>
2940 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
2941 not as a series of deletion and insertion mixed together with a very
2942 few lines that happen to match textually as the context, but as a
2943 single deletion of everything old followed by a single insertion of
2946 original should remain in the result for Git to consider it a total
2947 rewrite (i.e. otherwise the resulting patch will be a series of
2948 deletion and insertion mixed together with context lines).</p></div>
2949 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
2950 source of a rename (usually -M only considers a file that disappeared
2954 eligible for being picked up as a possible source of a rename to
2955 another file.</p></div>
2956 </dd>
2959 </dt>
2962 </dt>
2963 <dd>
2964 <p>
2965 If generating diffs, detect and report renames for each commit.
2966 For following files across renames while traversing history, see
2969 index (i.e. amount of addition/deletions compared to the
2971 delete/add pair to be a rename if more than 90% of the file
2977 </p>
2978 </dd>
2981 </dt>
2984 </dt>
2985 <dd>
2986 <p>
2989 </p>
2990 </dd>
2992 --find-copies-harder
2993 </dt>
2994 <dd>
2995 <p>
2997 if the original file of the copy was modified in the same
2998 changeset. This flag makes the command
2999 inspect unmodified files as candidates for the source of
3000 copy. This is a very expensive operation for large
3001 projects, so use it with caution. Giving more than one
3003 </p>
3004 </dd>
3006 -D
3007 </dt>
3009 --irreversible-delete
3010 </dt>
3011 <dd>
3012 <p>
3013 Omit the preimage for deletes, i.e. print only the header but not
3016 solely for people who want to just concentrate on reviewing the
3017 text after the change. In addition, the output obviously lacks
3018 enough information to apply such a patch in reverse, even manually,
3019 hence the name of the option.
3020 </p>
3021 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
3022 of a delete/create pair.</p></div>
3023 </dd>
3026 </dt>
3027 <dd>
3028 <p>
3030 can detect subsets of renames/copies cheaply, followed by an
3031 exhaustive fallback portion that compares all remaining
3032 unpaired destinations to all relevant sources. (For renames,
3033 only remaining unpaired sources are relevant; for copies, all
3034 original sources are relevant.) For N sources and
3035 destinations, this exhaustive check is O(N^2). This option
3036 prevents the exhaustive portion of rename/copy detection from
3037 running if the number of source/destination files involved
3038 exceeds the specified number. Defaults to diff.renameLimit.
3039 Note that a value of 0 is treated as unlimited.
3040 </p>
3041 </dd>
3043 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
3044 </dt>
3045 <dd>
3046 <p>
3052 Any combination of the filter characters (including none) can be used.
3054 paths are selected if there is any file that matches
3055 other criteria in the comparison; if there is no file
3056 that matches other criteria, nothing is selected.
3057 </p>
3060 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
3061 renamed entries cannot appear if detection for those types is disabled.</p></div>
3062 </dd>
3065 </dt>
3066 <dd>
3067 <p>
3068 Look for differences that change the number of occurrences of
3069 the specified string (i.e. addition/deletion) in a file.
3070 Intended for the scripter’s use.
3071 </p>
3072 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
3073 struct), and want to know the history of that block since it first
3074 came into being: use the feature iteratively to feed the interesting
3076 very first version of the block.</p></div>
3078 </dd>
3081 </dt>
3082 <dd>
3083 <p>
3084 Look for differences whose patch text contains added/removed
3086 </p>
3087 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
3089 file:</p></div>
3093 ...
3095 </div></div>
3096 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
3098 occurrences of that string did not change).</p></div>
3099 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
3100 filter will be ignored.</p></div>
3101 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
3102 information.</p></div>
3103 </dd>
3106 </dt>
3107 <dd>
3108 <p>
3109 Look for differences that change the number of occurrences of
3111 in that it doesn’t search for a specific string but for a specific
3112 object id.
3113 </p>
3114 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
3116 </dd>
3118 --pickaxe-all
3119 </dt>
3120 <dd>
3121 <p>
3123 changeset, not just the files that contain the change
3125 </p>
3126 </dd>
3128 --pickaxe-regex
3129 </dt>
3130 <dd>
3131 <p>
3133 expression to match.
3134 </p>
3135 </dd>
3138 </dt>
3139 <dd>
3140 <p>
3141 Control the order in which files appear in the output.
3145 </p>
3148 All files with pathnames that match the first pattern are output
3149 first, all files with pathnames that match the second pattern (but not
3150 the first) are output next, and so on.
3151 All files with pathnames that do not match any pattern are output
3152 last, as if there was an implicit match-all pattern at the end of the
3153 file.
3154 If multiple pathnames have the same rank (they match the same pattern
3155 but no earlier patterns), their output order relative to each other is
3156 the normal order.</p></div>
3161 <li>
3162 <p>
3163 Blank lines are ignored, so they can be used as separators for
3164 readability.
3165 </p>
3166 </li>
3167 <li>
3168 <p>
3169 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
3170 for comments. Add a backslash ("<code>\</code>") to the beginning of the
3171 pattern if it starts with a hash.
3172 </p>
3173 </li>
3174 <li>
3175 <p>
3176 Each other line contains a single pattern.
3177 </p>
3178 </li>
3179 </ul></div>
3180 </div></div>
3182 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
3183 matches a pattern if removing any number of the final pathname
3184 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
3185 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
3186 </dd>
3189 </dt>
3192 </dt>
3193 <dd>
3194 <p>
3199 otherwise.
3200 </p>
3201 </dd>
3203 -R
3204 </dt>
3205 <dd>
3206 <p>
3207 Swap two inputs; that is, show differences from index or
3208 on-disk file to tree contents.
3209 </p>
3210 </dd>
3213 </dt>
3215 --no-relative
3216 </dt>
3217 <dd>
3218 <p>
3219 When run from a subdirectory of the project, it can be
3220 told to exclude changes outside the directory and show
3221 pathnames relative to it with this option. When you are
3222 not in a subdirectory (e.g. in a bare repository), you
3223 can name which subdirectory to make the output relative
3227 </p>
3228 </dd>
3230 -a
3231 </dt>
3233 --text
3234 </dt>
3235 <dd>
3236 <p>
3237 Treat all files as text.
3238 </p>
3239 </dd>
3241 --ignore-cr-at-eol
3242 </dt>
3243 <dd>
3244 <p>
3245 Ignore carriage-return at the end of line when doing a comparison.
3246 </p>
3247 </dd>
3249 --ignore-space-at-eol
3250 </dt>
3251 <dd>
3252 <p>
3253 Ignore changes in whitespace at EOL.
3254 </p>
3255 </dd>
3257 -b
3258 </dt>
3260 --ignore-space-change
3261 </dt>
3262 <dd>
3263 <p>
3264 Ignore changes in amount of whitespace. This ignores whitespace
3265 at line end, and considers all other sequences of one or
3266 more whitespace characters to be equivalent.
3267 </p>
3268 </dd>
3270 -w
3271 </dt>
3273 --ignore-all-space
3274 </dt>
3275 <dd>
3276 <p>
3277 Ignore whitespace when comparing lines. This ignores
3278 differences even if one line has whitespace where the other
3279 line has none.
3280 </p>
3281 </dd>
3283 --ignore-blank-lines
3284 </dt>
3285 <dd>
3286 <p>
3287 Ignore changes whose lines are all blank.
3288 </p>
3289 </dd>
3292 </dt>
3295 </dt>
3296 <dd>
3297 <p>
3299 be specified more than once.
3300 </p>
3301 </dd>
3304 </dt>
3305 <dd>
3306 <p>
3307 Show the context between diff hunks, up to the specified number
3308 of lines, thereby fusing hunks that are close to each other.
3310 is unset.
3311 </p>
3312 </dd>
3314 -W
3315 </dt>
3317 --function-context
3318 </dt>
3319 <dd>
3320 <p>
3321 Show whole function as context lines for each change.
3322 The function names are determined in the same way as
3325 </p>
3326 </dd>
3328 --ext-diff
3329 </dt>
3330 <dd>
3331 <p>
3332 Allow an external diff helper to be executed. If you set an
3335 </p>
3336 </dd>
3338 --no-ext-diff
3339 </dt>
3340 <dd>
3341 <p>
3342 Disallow external diff drivers.
3343 </p>
3344 </dd>
3346 --textconv
3347 </dt>
3349 --no-textconv
3350 </dt>
3351 <dd>
3352 <p>
3353 Allow (or disallow) external text conversion filters to be run
3355 details. Because textconv filters are typically a one-way
3356 conversion, the resulting diff is suitable for human
3357 consumption, but cannot be applied. For this reason, textconv
3359 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
3360 diff plumbing commands.
3361 </p>
3362 </dd>
3365 </dt>
3366 <dd>
3367 <p>
3370 Using "none" will consider the submodule modified when it either contains
3371 untracked or modified files or its HEAD differs from the commit recorded
3372 in the superproject and can be used to override any settings of the
3373 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
3374 "untracked" is used submodules are not considered dirty when they only
3375 contain untracked content (but they are still scanned for modified
3376 content). Using "dirty" ignores all changes to the work tree of submodules,
3377 only changes to the commits stored in the superproject are shown (this was
3379 </p>
3380 </dd>
3383 </dt>
3384 <dd>
3385 <p>
3386 Show the given source prefix instead of "a/".
3387 </p>
3388 </dd>
3391 </dt>
3392 <dd>
3393 <p>
3394 Show the given destination prefix instead of "b/".
3395 </p>
3396 </dd>
3398 --no-prefix
3399 </dt>
3400 <dd>
3401 <p>
3402 Do not show any source or destination prefix.
3403 </p>
3404 </dd>
3406 --default-prefix
3407 </dt>
3408 <dd>
3409 <p>
3411 This is usually the default already, but may be used to override
3413 </p>
3414 </dd>
3417 </dt>
3418 <dd>
3419 <p>
3420 Prepend an additional prefix to every line of output.
3421 </p>
3422 </dd>
3424 --ita-invisible-in-index
3425 </dt>
3426 <dd>
3427 <p>
3428 By default entries added by "git add -N" appear as an existing
3430 This option makes the entry appear as a new file in "git diff"
3431 and non-existent in "git diff --cached". This option could be
3433 experimental and could be removed in future.
3434 </p>
3435 </dd>
3436 </dl></div>
3439 </div>
3440 </div>
3452 You can customize the creation of patch text via the
3454 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
3455 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
3456 diff format:</p></div>
3458 <li>
3459 <p>
3460 It is preceded by a "git diff" header that looks like this:
3461 </p>
3465 </div></div>
3466 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
3467 involved. Especially, even for a creation or a deletion,
3468 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
3469 <div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
3470 name of the source file of the rename/copy and the name of
3471 the file that the rename/copy produces, respectively.</p></div>
3472 </li>
3473 <li>
3474 <p>
3475 It is followed by one or more extended header lines:
3476 </p>
3490 </div></div>
3491 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
3492 and file permission bits.</p></div>
3493 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
3495 the dissimilarity index is the percentage of changed lines. It
3496 is a rounded down integer, followed by a percent sign. The
3497 similarity index value of 100% is thus reserved for two equal
3498 files, while 100% dissimilarity means that no line from the old
3499 file made it into the new one.</p></div>
3500 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
3502 separate lines indicate the old and the new mode.</p></div>
3503 </li>
3504 <li>
3505 <p>
3506 Pathnames with "unusual" characters are quoted as explained for
3509 </p>
3510 </li>
3511 <li>
3512 <p>
3515 It is incorrect to apply each change to each file sequentially. For
3516 example, this patch will swap a and b:
3517 </p>
3520 <pre><code>diff --git a/a b/b
3521 rename from a
3522 rename to b
3523 diff --git a/b b/a
3524 rename from b
3525 rename to a</code></pre>
3526 </div></div>
3527 </li>
3528 <li>
3529 <p>
3530 Hunk headers mention the name of the function to which the hunk
3531 applies. See "Defining a custom hunk-header" in
3533 specific languages.
3534 </p>
3535 </li>
3536 </ol></div>
3537 </div>
3538 </div>
3542 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
3547 diffs in a specific format.</p></div>
3551 <pre><code>diff --combined describe.c
3552 index fabadb8,cc95eb0..4866510
3553 --- a/describe.c
3554 +++ b/describe.c
3557 }
3559 - static void describe(char *arg)
3560 -static void describe(struct commit *cmit, int last_one)
3561 ++static void describe(char *arg, int last_one)
3562 {
3563 + unsigned char sha1[20];
3564 + struct commit *cmit;
3565 struct commit_list *list;
3566 static int initialized = 0;
3567 struct commit_name *n;
3570 + usage(describe_usage);
3571 + cmit = lookup_commit_reference(sha1);
3572 + if (!cmit)
3573 + usage(describe_usage);
3574 +
3575 if (!initialized) {
3576 initialized = 1;
3577 for_each_ref(get_name);</code></pre>
3578 </div></div>
3580 <li>
3581 <p>
3582 It is preceded by a "git diff" header, that looks like
3584 </p>
3588 </div></div>
3593 </div></div>
3594 </li>
3595 <li>
3596 <p>
3597 It is followed by one or more extended header lines
3598 (this example shows a merge with two parents):
3599 </p>
3606 </div></div>
3607 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
3609 information about detected content movement (renames and
3610 copying detection) are designed to work with the diff of two
3612 </li>
3613 <li>
3614 <p>
3615 It is followed by a two-line from-file/to-file header:
3616 </p>
3619 <pre><code>--- a/file
3620 +++ b/file</code></pre>
3621 </div></div>
3622 <div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
3624 files.</p></div>
3625 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
3626 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
3627 where N is the number of parents in the merge commit:</p></div>
3630 <pre><code>--- a/file
3631 --- a/file
3632 --- a/file
3633 +++ b/file</code></pre>
3634 </div></div>
3636 active, to allow you to see the original name of the file in different
3637 parents.</p></div>
3638 </li>
3639 <li>
3640 <p>
3641 Chunk header format is modified to prevent people from
3643 was created for review of merge commit changes, and was not
3644 meant to be applied. The change is similar to the change in the
3646 </p>
3649 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
3650 </div></div>
3651 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
3652 header for combined diff format.</p></div>
3653 </li>
3654 </ol></div>
3656 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
3658 compares two or more files file1, file2,… with one file X, and
3659 shows how X differs from each of fileN. One column for each of
3660 fileN is prepended to the output line to note how X’s line is
3661 different from it.</p></div>
3662 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
3664 in the column N means that the line appears in the result,
3665 and fileN does not have that line (in other words, the line was
3666 added, from the point of view of that parent).</p></div>
3670 in either file1 or file2). Also, eight other lines are the same
3672 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
3673 merge commit with the merge result (i.e. file1..fileN are the
3675 two unresolved merge parents with the working tree file
3678 </div>
3679 </div>
3686 </dt>
3687 <dd>
3688 <p>
3690 points at.
3691 </p>
3692 </dd>
3695 </dt>
3696 <dd>
3697 <p>
3699 </p>
3700 </dd>
3703 </dt>
3704 <dd>
3705 <p>
3706 Shows the subject of the commit pointed to by the
3708 </p>
3709 </dd>
3712 </dt>
3713 <dd>
3714 <p>
3716 they were current in the 10th last commit of the branch
3718 </p>
3719 </dd>
3722 </dt>
3723 <dd>
3724 <p>
3725 Concatenates the contents of said Makefiles in the head
3727 </p>
3728 </dd>
3729 </dl></div>
3730 </div>
3731 </div>
3737 <li>
3738 <p>
3739 The contents of the blob objects are uninterpreted sequences
3740 of bytes. There is no encoding translation at the core
3741 level.
3742 </p>
3743 </li>
3744 <li>
3745 <p>
3746 Path names are encoded in UTF-8 normalization form C. This
3747 applies to tree objects, the index file, ref names, as well as
3748 path names in command line arguments, environment variables
3750 <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and
3752 </p>
3754 sequences of non-NUL bytes, there are no path name encoding
3755 conversions (except on Mac and Windows). Therefore, using
3756 non-ASCII path names will mostly work even on platforms and file
3757 systems that use legacy extended ASCII encodings. However,
3758 repositories created on such systems will not work properly on
3759 UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa.
3760 Additionally, many Git-based tools simply assume path names to
3762 </li>
3763 <li>
3764 <p>
3765 Commit log messages are typically encoded in UTF-8, but other
3766 extended ASCII encodings are also supported. This includes
3768 EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5,
3769 EUC-x, CP9xx etc.).
3770 </p>
3771 </li>
3772 </ul></div>
3774 in UTF-8, both the core and Git Porcelain are designed not to
3775 force UTF-8 on projects. If all participants of a particular
3776 project find it more convenient to use legacy encodings, Git
3777 does not forbid it. However, there are a few things to keep in
3778 mind.</p></div>
3780 <li>
3781 <p>
3783 a warning if the commit log message given to it does not look
3784 like a valid UTF-8 string, unless you explicitly say your
3785 project uses a legacy encoding. The way to say this is to
3787 </p>
3790 <pre><code>[i18n]
3792 </div></div>
3795 help other people who look at them later. Lack of this header
3797 </li>
3798 <li>
3799 <p>
3802 log message into UTF-8 unless otherwise specified. You can
3803 specify the desired output encoding with
3805 </p>
3808 <pre><code>[i18n]
3810 </div></div>
3813 </li>
3814 </ol></div>
3816 message when a commit is made to force UTF-8 at the commit
3817 object level, because re-coding to UTF-8 is not necessarily a
3818 reversible operation.</p></div>
3819 </div>
3820 </div>
3825 </div>
3826 </div>
3827 </div>
3831 Last updated
3833 </div>
3834 </div>
3835 </body>
3836 </html>