| blob | 89367cb5e662b03e47f392b1398d82527850e805 |
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>
1893 the literal formatting codes described above. To use comma as
1896 shows all trailer lines whose key is "Ticket" separated by a comma
1897 and a space.
1898 </p>
1899 </li>
1900 <li>
1901 <p>
1902 <em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code>
1903 option was given. E.g.,
1905 </p>
1906 </li>
1907 <li>
1908 <p>
1910 </p>
1911 </li>
1912 <li>
1913 <p>
1915 </p>
1916 </li>
1917 <li>
1918 <p>
1920 the key and value of each trailer. Defaults to ": ". Otherwise it
1922 </p>
1923 </li>
1924 </ul></div>
1925 </dd>
1926 </dl></div>
1927 </li>
1928 </ul></div>
1929 </li>
1930 </ul></div>
1932 <table><tr>
1935 </td>
1938 insert an empty string unless we are traversing reflog entries (e.g., by
1939 <code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
1941 line.</td>
1942 </tr></table>
1943 </div>
1944 <div class="paragraph"><p>The boolean options accept an optional value <code>[=<bool-value>]</code>. The values
1945 <code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
1948 <div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
1949 is inserted immediately before the expansion if and only if the
1950 placeholder expands to a non-empty string.</p></div>
1951 <div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
1952 line-feeds immediately preceding the expansion are deleted if and only if the
1953 placeholder expands to an empty string.</p></div>
1955 is inserted immediately before the expansion if and only if the
1956 placeholder expands to a non-empty string.</p></div>
1958 <li>
1959 <p>
1961 </p>
1962 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1964 other words, each commit has the message terminator character (usually a
1965 newline) appended, rather than a separator placed between entries.
1966 This means that the final entry of a single-line format will be properly
1967 terminated with a new line, just as the "oneline" format does.
1968 For example:</p></div>
1972 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1973 4da45be
1974 7134973 -- NO NEWLINE
1977 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1978 4da45be
1980 </div></div>
1981 <div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
1983 equivalent:</p></div>
1988 </div></div>
1989 </li>
1990 </ul></div>
1991 </div>
1992 </div>
1996 <div class="paragraph"><p>The options below can be used to change the way <code>git show</code> generates
1997 diff output.</p></div>
2000 -p
2001 </dt>
2003 -u
2004 </dt>
2006 --patch
2007 </dt>
2008 <dd>
2009 <p>
2011 </p>
2012 </dd>
2014 -s
2015 </dt>
2017 --no-patch
2018 </dt>
2019 <dd>
2020 <p>
2021 Suppress all output from the diff machinery. Useful for
2023 squelch their output, or to cancel the effect of options like
2025 </p>
2026 </dd>
2028 -m
2029 </dt>
2030 <dd>
2031 <p>
2032 Show diffs for merge commits in the default format. This is
2035 </p>
2036 </dd>
2038 -c
2039 </dt>
2040 <dd>
2041 <p>
2042 Produce combined diff output for merge commits.
2044 </p>
2045 </dd>
2047 --cc
2048 </dt>
2049 <dd>
2050 <p>
2051 Produce dense combined diff output for merge commits.
2053 </p>
2054 </dd>
2056 --dd
2057 </dt>
2058 <dd>
2059 <p>
2060 Produce diff with respect to first parent for both merge and
2061 regular commits.
2063 </p>
2064 </dd>
2066 --remerge-diff
2067 </dt>
2068 <dd>
2069 <p>
2070 Produce remerge-diff output for merge commits.
2072 </p>
2073 </dd>
2075 --no-diff-merges
2076 </dt>
2077 <dd>
2078 <p>
2080 </p>
2081 </dd>
2084 </dt>
2085 <dd>
2086 <p>
2087 Specify diff format to be used for merge commits. Default is
2090 </p>
2096 off, none
2097 </dt>
2098 <dd>
2099 <p>
2100 Disable output of diffs for merge commits. Useful to override
2101 implied value.
2102 </p>
2103 </dd>
2105 on, m
2106 </dt>
2107 <dd>
2108 <p>
2109 Make diff output for merge commits to be shown in the default
2110 format. The default format can be changed using
2113 </p>
2114 </dd>
2116 first-parent, 1
2117 </dt>
2118 <dd>
2119 <p>
2120 Show full diff with respect to first parent. This is the same
2122 </p>
2123 </dd>
2125 separate
2126 </dt>
2127 <dd>
2128 <p>
2129 Show full diff with respect to each of parents.
2130 Separate log entry and diff is generated for each parent.
2131 </p>
2132 </dd>
2134 combined, c
2135 </dt>
2136 <dd>
2137 <p>
2138 Show differences from each of the parents to the merge
2139 result simultaneously instead of showing pairwise diff between
2140 a parent and the result one at a time. Furthermore, it lists
2141 only files which were modified from all parents.
2142 </p>
2143 </dd>
2145 dense-combined, cc
2146 </dt>
2147 <dd>
2148 <p>
2150 by omitting uninteresting hunks whose contents in the parents
2151 have only two variants and the merge result picks one of them
2152 without modification.
2153 </p>
2154 </dd>
2156 remerge, r
2157 </dt>
2158 <dd>
2159 <p>
2160 Remerge two-parent merge commits to create a temporary tree
2161 object—potentially containing files with conflict markers
2162 and such. A diff is then shown between that temporary tree
2163 and the actual merge commit.
2164 </p>
2165 <div class="paragraph"><p>The output emitted when this option is used is subject to change, and
2166 so is its interaction with other options (unless explicitly
2167 documented).</p></div>
2168 </dd>
2169 </dl></div>
2170 </div></div>
2171 </dd>
2173 --combined-all-paths
2174 </dt>
2175 <dd>
2176 <p>
2177 This flag causes combined diffs (used for merge commits) to
2178 list the name of the file from all parents. It thus only has
2180 is likely only useful if filename changes are detected (i.e.
2181 when either rename or copy detection have been requested).
2182 </p>
2183 </dd>
2186 </dt>
2189 </dt>
2190 <dd>
2191 <p>
2193 the usual three.
2195 </p>
2196 </dd>
2199 </dt>
2200 <dd>
2201 <p>
2202 Output to a specific file instead of stdout.
2203 </p>
2204 </dd>
2207 </dt>
2210 </dt>
2213 </dt>
2214 <dd>
2215 <p>
2216 Specify the character used to indicate new, old or context
2218 ' ' respectively.
2219 </p>
2220 </dd>
2222 --raw
2223 </dt>
2224 <dd>
2225 <p>
2226 For each commit, show a summary of changes using the raw diff
2227 format. See the "RAW OUTPUT FORMAT" section of
2229 itself in raw format, which you can achieve with
2231 </p>
2232 </dd>
2234 --patch-with-raw
2235 </dt>
2236 <dd>
2237 <p>
2239 </p>
2240 </dd>
2242 -t
2243 </dt>
2244 <dd>
2245 <p>
2246 Show the tree objects in the diff output.
2247 </p>
2248 </dd>
2250 --indent-heuristic
2251 </dt>
2252 <dd>
2253 <p>
2254 Enable the heuristic that shifts diff hunk boundaries to make patches
2255 easier to read. This is the default.
2256 </p>
2257 </dd>
2259 --no-indent-heuristic
2260 </dt>
2261 <dd>
2262 <p>
2263 Disable the indent heuristic.
2264 </p>
2265 </dd>
2267 --minimal
2268 </dt>
2269 <dd>
2270 <p>
2271 Spend extra time to make sure the smallest possible
2272 diff is produced.
2273 </p>
2274 </dd>
2276 --patience
2277 </dt>
2278 <dd>
2279 <p>
2280 Generate a diff using the "patience diff" algorithm.
2281 </p>
2282 </dd>
2284 --histogram
2285 </dt>
2286 <dd>
2287 <p>
2288 Generate a diff using the "histogram diff" algorithm.
2289 </p>
2290 </dd>
2293 </dt>
2294 <dd>
2295 <p>
2296 Generate a diff using the "anchored diff" algorithm.
2297 </p>
2299 <div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
2300 and starts with this text, this algorithm attempts to prevent it from
2301 appearing as a deletion or addition in the output. It uses the "patience
2303 </dd>
2305 --diff-algorithm={patience|minimal|histogram|myers}
2306 </dt>
2307 <dd>
2308 <p>
2309 Choose a diff algorithm. The variants are as follows:
2310 </p>
2316 </dt>
2317 <dd>
2318 <p>
2319 The basic greedy diff algorithm. Currently, this is the default.
2320 </p>
2321 </dd>
2324 </dt>
2325 <dd>
2326 <p>
2327 Spend extra time to make sure the smallest possible diff is
2328 produced.
2329 </p>
2330 </dd>
2333 </dt>
2334 <dd>
2335 <p>
2336 Use "patience diff" algorithm when generating patches.
2337 </p>
2338 </dd>
2341 </dt>
2342 <dd>
2343 <p>
2344 This algorithm extends the patience algorithm to "support
2345 low-occurrence common elements".
2346 </p>
2347 </dd>
2348 </dl></div>
2349 </div></div>
2350 <div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
2351 non-default value and want to use the default one, then you
2353 </dd>
2356 </dt>
2357 <dd>
2358 <p>
2359 Generate a diffstat. By default, as much space as necessary
2360 will be used for the filename part, and the rest for the graph
2361 part. Maximum width defaults to terminal width, or 80 columns
2362 if not connected to a terminal, and can be overridden by
2373 </p>
2374 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
2375 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
2376 </dd>
2378 --compact-summary
2379 </dt>
2380 <dd>
2381 <p>
2382 Output a condensed summary of extended header information such
2385 or removing executable bit respectively) in diffstat. The
2386 information is put between the filename part and the graph
2388 </p>
2389 </dd>
2391 --numstat
2392 </dt>
2393 <dd>
2394 <p>
2396 deleted lines in decimal notation and pathname without
2397 abbreviation, to make it more machine friendly. For
2400 </p>
2401 </dd>
2403 --shortstat
2404 </dt>
2405 <dd>
2406 <p>
2408 number of modified files, as well as number of added and deleted
2409 lines.
2410 </p>
2411 </dd>
2414 </dt>
2417 </dt>
2418 <dd>
2419 <p>
2420 Output the distribution of relative amount of changes for each
2422 passing it a comma separated list of parameters.
2425 The following parameters are available:
2426 </p>
2432 </dt>
2433 <dd>
2434 <p>
2435 Compute the dirstat numbers by counting the lines that have been
2436 removed from the source, or added to the destination. This ignores
2437 the amount of pure code movements within a file. In other words,
2438 rearranging lines in a file is not counted as much as other changes.
2439 This is the default behavior when no parameter is given.
2440 </p>
2441 </dd>
2444 </dt>
2445 <dd>
2446 <p>
2447 Compute the dirstat numbers by doing the regular line-based diff
2448 analysis, and summing the removed/added line counts. (For binary
2449 files, count 64-byte chunks instead, since binary files have no
2452 lines within a file as much as other changes. The resulting output
2454 </p>
2455 </dd>
2458 </dt>
2459 <dd>
2460 <p>
2461 Compute the dirstat numbers by counting the number of files changed.
2462 Each changed file counts equally in the dirstat analysis. This is
2464 not have to look at the file contents at all.
2465 </p>
2466 </dd>
2469 </dt>
2470 <dd>
2471 <p>
2472 Count changes in a child directory for the parent directory as well.
2474 reported may exceed 100%. The default (non-cumulative) behavior can
2476 </p>
2477 </dd>
2480 </dt>
2481 <dd>
2482 <p>
2483 An integer parameter specifies a cut-off percent (3% by default).
2484 Directories contributing less than this percentage of the changes
2485 are not shown in the output.
2486 </p>
2487 </dd>
2488 </dl></div>
2489 </div></div>
2491 directories with less than 10% of the total amount of changed files,
2492 and accumulating child directory counts in the parent directories:
2494 </dd>
2496 --cumulative
2497 </dt>
2498 <dd>
2499 <p>
2500 Synonym for --dirstat=cumulative
2501 </p>
2502 </dd>
2505 </dt>
2506 <dd>
2507 <p>
2509 </p>
2510 </dd>
2512 --summary
2513 </dt>
2514 <dd>
2515 <p>
2516 Output a condensed summary of extended header information
2517 such as creations, renames and mode changes.
2518 </p>
2519 </dd>
2521 --patch-with-stat
2522 </dt>
2523 <dd>
2524 <p>
2526 </p>
2527 </dd>
2529 -z
2530 </dt>
2531 <dd>
2532 <p>
2533 Separate the commits with NULs instead of newlines.
2534 </p>
2535 <div class="paragraph"><p>Also, when <code>--raw</code> or <code>--numstat</code> has been given, do not munge
2536 pathnames and use NULs as output field terminators.</p></div>
2537 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
2540 </dd>
2542 --name-only
2543 </dt>
2544 <dd>
2545 <p>
2546 Show only names of changed files. The file names are often encoded in UTF-8.
2547 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
2548 manual page.
2549 </p>
2550 </dd>
2552 --name-status
2553 </dt>
2554 <dd>
2555 <p>
2556 Show only names and status of changed files. See the description
2559 </p>
2560 </dd>
2563 </dt>
2564 <dd>
2565 <p>
2566 Specify how differences in submodules are shown. When specifying
2568 shows the names of the commits at the beginning and end of the range.
2570 format is used. This format lists the commits in the range like
2571 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
2573 inline diff of the changes in the submodule contents between the
2575 if the config option is unset.
2576 </p>
2577 </dd>
2580 </dt>
2581 <dd>
2582 <p>
2583 Show colored diff.
2584 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
2585 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
2586 </p>
2587 </dd>
2589 --no-color
2590 </dt>
2591 <dd>
2592 <p>
2593 Turn off colored diff.
2595 </p>
2596 </dd>
2599 </dt>
2600 <dd>
2601 <p>
2602 Moved lines of code are colored differently.
2605 The mode must be one of:
2606 </p>
2611 no
2612 </dt>
2613 <dd>
2614 <p>
2615 Moved lines are not highlighted.
2616 </p>
2617 </dd>
2619 default
2620 </dt>
2621 <dd>
2622 <p>
2624 in the future.
2625 </p>
2626 </dd>
2628 plain
2629 </dt>
2630 <dd>
2631 <p>
2632 Any line that is added in one location and was removed
2635 that are added somewhere else in the diff. This mode picks up any
2636 moved line, but it is not very useful in a review to determine
2637 if a block of code was moved without permutation.
2638 </p>
2639 </dd>
2641 blocks
2642 </dt>
2643 <dd>
2644 <p>
2645 Blocks of moved text of at least 20 alphanumeric characters
2646 are detected greedily. The detected blocks are
2648 Adjacent blocks cannot be told apart.
2649 </p>
2650 </dd>
2652 zebra
2653 </dt>
2654 <dd>
2655 <p>
2659 the two colors indicates that a new block was detected.
2660 </p>
2661 </dd>
2663 dimmed-zebra
2664 </dt>
2665 <dd>
2666 <p>
2668 of moved code is performed. The bordering lines of two adjacent
2669 blocks are considered interesting, the rest is uninteresting.
2671 </p>
2672 </dd>
2673 </dl></div>
2674 </div></div>
2675 </dd>
2677 --no-color-moved
2678 </dt>
2679 <dd>
2680 <p>
2681 Turn off move detection. This can be used to override configuration
2683 </p>
2684 </dd>
2687 </dt>
2688 <dd>
2689 <p>
2690 This configures how whitespace is ignored when performing the
2692 These modes can be given as a comma separated list:
2693 </p>
2698 no
2699 </dt>
2700 <dd>
2701 <p>
2702 Do not ignore whitespace when performing move detection.
2703 </p>
2704 </dd>
2706 ignore-space-at-eol
2707 </dt>
2708 <dd>
2709 <p>
2710 Ignore changes in whitespace at EOL.
2711 </p>
2712 </dd>
2714 ignore-space-change
2715 </dt>
2716 <dd>
2717 <p>
2718 Ignore changes in amount of whitespace. This ignores whitespace
2719 at line end, and considers all other sequences of one or
2720 more whitespace characters to be equivalent.
2721 </p>
2722 </dd>
2724 ignore-all-space
2725 </dt>
2726 <dd>
2727 <p>
2728 Ignore whitespace when comparing lines. This ignores differences
2729 even if one line has whitespace where the other line has none.
2730 </p>
2731 </dd>
2733 allow-indentation-change
2734 </dt>
2735 <dd>
2736 <p>
2737 Initially ignore any whitespace in the move detection, then
2738 group the moved code blocks only into a block if the change in
2739 whitespace is the same per line. This is incompatible with the
2740 other modes.
2741 </p>
2742 </dd>
2743 </dl></div>
2744 </div></div>
2745 </dd>
2747 --no-color-moved-ws
2748 </dt>
2749 <dd>
2750 <p>
2751 Do not ignore whitespace when performing move detection. This can be
2752 used to override configuration settings. It is the same as
2754 </p>
2755 </dd>
2758 </dt>
2759 <dd>
2760 <p>
2762 By default, words are delimited by whitespace; see
2764 must be one of:
2765 </p>
2770 color
2771 </dt>
2772 <dd>
2773 <p>
2775 </p>
2776 </dd>
2778 plain
2779 </dt>
2780 <dd>
2781 <p>
2783 attempts to escape the delimiters if they appear in the input,
2784 so the output may be ambiguous.
2785 </p>
2786 </dd>
2788 porcelain
2789 </dt>
2790 <dd>
2791 <p>
2792 Use a special line-based format intended for script
2793 consumption. Added/removed/unchanged runs are printed in the
2795 character at the beginning of the line and extending to the
2796 end of the line. Newlines in the input are represented by a
2798 </p>
2799 </dd>
2801 none
2802 </dt>
2803 <dd>
2804 <p>
2805 Disable word diff again.
2806 </p>
2807 </dd>
2808 </dl></div>
2809 </div></div>
2811 highlight the changed parts in all modes if enabled.</p></div>
2812 </dd>
2815 </dt>
2816 <dd>
2817 <p>
2819 runs of non-whitespace to be a word. Also implies
2821 </p>
2824 considered whitespace and ignored(!) for the purposes of finding
2826 expression to make sure that it matches all non-whitespace characters.
2827 A match that contains a newline is silently truncated(!) at the
2828 newline.</p></div>
2829 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
2830 and, correspondingly, show differences character by character.</p></div>
2831 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
2832 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
2833 overrides any diff driver or configuration setting. Diff drivers
2834 override configuration settings.</p></div>
2835 </dd>
2838 </dt>
2839 <dd>
2840 <p>
2843 </p>
2844 </dd>
2846 --no-renames
2847 </dt>
2848 <dd>
2849 <p>
2850 Turn off rename detection, even when the configuration
2851 file gives the default to do so.
2852 </p>
2853 </dd>
2855 --[no-]rename-empty
2856 </dt>
2857 <dd>
2858 <p>
2859 Whether to use empty blobs as rename source.
2860 </p>
2861 </dd>
2863 --check
2864 </dt>
2865 <dd>
2866 <p>
2867 Warn if changes introduce conflict markers or whitespace errors.
2869 configuration. By default, trailing whitespaces (including
2870 lines that consist solely of whitespaces) and a space character
2871 that is immediately followed by a tab character inside the
2872 initial indent of the line are considered whitespace errors.
2873 Exits with non-zero status if problems are found. Not compatible
2874 with --exit-code.
2875 </p>
2876 </dd>
2879 </dt>
2880 <dd>
2881 <p>
2883 lines of the diff. Multiple values are separated by comma,
2886 this option is not given, and the configuration variable
2890 </p>
2891 </dd>
2893 --full-index
2894 </dt>
2895 <dd>
2896 <p>
2897 Instead of the first handful of characters, show the full
2898 pre- and post-image blob object names on the "index"
2899 line when generating patch format output.
2900 </p>
2901 </dd>
2903 --binary
2904 </dt>
2905 <dd>
2906 <p>
2910 </p>
2911 </dd>
2914 </dt>
2915 <dd>
2916 <p>
2917 Instead of showing the full 40-byte hexadecimal object
2918 name in diff-raw format output and diff-tree header
2920 hexdigits long that uniquely refers the object.
2925 </p>
2926 </dd>
2929 </dt>
2932 </dt>
2933 <dd>
2934 <p>
2935 Break complete rewrite changes into pairs of delete and
2936 create. This serves two purposes:
2937 </p>
2938 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
2939 not as a series of deletion and insertion mixed together with a very
2940 few lines that happen to match textually as the context, but as a
2941 single deletion of everything old followed by a single insertion of
2944 original should remain in the result for Git to consider it a total
2945 rewrite (i.e. otherwise the resulting patch will be a series of
2946 deletion and insertion mixed together with context lines).</p></div>
2947 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
2948 source of a rename (usually -M only considers a file that disappeared
2952 eligible for being picked up as a possible source of a rename to
2953 another file.</p></div>
2954 </dd>
2957 </dt>
2960 </dt>
2961 <dd>
2962 <p>
2963 If generating diffs, detect and report renames for each commit.
2964 For following files across renames while traversing history, see
2967 index (i.e. amount of addition/deletions compared to the
2969 delete/add pair to be a rename if more than 90% of the file
2975 </p>
2976 </dd>
2979 </dt>
2982 </dt>
2983 <dd>
2984 <p>
2987 </p>
2988 </dd>
2990 --find-copies-harder
2991 </dt>
2992 <dd>
2993 <p>
2995 if the original file of the copy was modified in the same
2996 changeset. This flag makes the command
2997 inspect unmodified files as candidates for the source of
2998 copy. This is a very expensive operation for large
2999 projects, so use it with caution. Giving more than one
3001 </p>
3002 </dd>
3004 -D
3005 </dt>
3007 --irreversible-delete
3008 </dt>
3009 <dd>
3010 <p>
3011 Omit the preimage for deletes, i.e. print only the header but not
3014 solely for people who want to just concentrate on reviewing the
3015 text after the change. In addition, the output obviously lacks
3016 enough information to apply such a patch in reverse, even manually,
3017 hence the name of the option.
3018 </p>
3019 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
3020 of a delete/create pair.</p></div>
3021 </dd>
3024 </dt>
3025 <dd>
3026 <p>
3028 can detect subsets of renames/copies cheaply, followed by an
3029 exhaustive fallback portion that compares all remaining
3030 unpaired destinations to all relevant sources. (For renames,
3031 only remaining unpaired sources are relevant; for copies, all
3032 original sources are relevant.) For N sources and
3033 destinations, this exhaustive check is O(N^2). This option
3034 prevents the exhaustive portion of rename/copy detection from
3035 running if the number of source/destination files involved
3036 exceeds the specified number. Defaults to diff.renameLimit.
3037 Note that a value of 0 is treated as unlimited.
3038 </p>
3039 </dd>
3041 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
3042 </dt>
3043 <dd>
3044 <p>
3050 Any combination of the filter characters (including none) can be used.
3052 paths are selected if there is any file that matches
3053 other criteria in the comparison; if there is no file
3054 that matches other criteria, nothing is selected.
3055 </p>
3058 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
3059 renamed entries cannot appear if detection for those types is disabled.</p></div>
3060 </dd>
3063 </dt>
3064 <dd>
3065 <p>
3066 Look for differences that change the number of occurrences of
3067 the specified string (i.e. addition/deletion) in a file.
3068 Intended for the scripter’s use.
3069 </p>
3070 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
3071 struct), and want to know the history of that block since it first
3072 came into being: use the feature iteratively to feed the interesting
3074 very first version of the block.</p></div>
3076 </dd>
3079 </dt>
3080 <dd>
3081 <p>
3082 Look for differences whose patch text contains added/removed
3084 </p>
3085 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
3087 file:</p></div>
3091 ...
3093 </div></div>
3094 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
3096 occurrences of that string did not change).</p></div>
3097 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
3098 filter will be ignored.</p></div>
3099 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
3100 information.</p></div>
3101 </dd>
3104 </dt>
3105 <dd>
3106 <p>
3107 Look for differences that change the number of occurrences of
3109 in that it doesn’t search for a specific string but for a specific
3110 object id.
3111 </p>
3112 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
3114 </dd>
3116 --pickaxe-all
3117 </dt>
3118 <dd>
3119 <p>
3121 changeset, not just the files that contain the change
3123 </p>
3124 </dd>
3126 --pickaxe-regex
3127 </dt>
3128 <dd>
3129 <p>
3131 expression to match.
3132 </p>
3133 </dd>
3136 </dt>
3137 <dd>
3138 <p>
3139 Control the order in which files appear in the output.
3143 </p>
3146 All files with pathnames that match the first pattern are output
3147 first, all files with pathnames that match the second pattern (but not
3148 the first) are output next, and so on.
3149 All files with pathnames that do not match any pattern are output
3150 last, as if there was an implicit match-all pattern at the end of the
3151 file.
3152 If multiple pathnames have the same rank (they match the same pattern
3153 but no earlier patterns), their output order relative to each other is
3154 the normal order.</p></div>
3159 <li>
3160 <p>
3161 Blank lines are ignored, so they can be used as separators for
3162 readability.
3163 </p>
3164 </li>
3165 <li>
3166 <p>
3167 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
3168 for comments. Add a backslash ("<code>\</code>") to the beginning of the
3169 pattern if it starts with a hash.
3170 </p>
3171 </li>
3172 <li>
3173 <p>
3174 Each other line contains a single pattern.
3175 </p>
3176 </li>
3177 </ul></div>
3178 </div></div>
3180 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
3181 matches a pattern if removing any number of the final pathname
3182 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
3183 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
3184 </dd>
3187 </dt>
3190 </dt>
3191 <dd>
3192 <p>
3197 otherwise.
3198 </p>
3199 </dd>
3201 -R
3202 </dt>
3203 <dd>
3204 <p>
3205 Swap two inputs; that is, show differences from index or
3206 on-disk file to tree contents.
3207 </p>
3208 </dd>
3211 </dt>
3213 --no-relative
3214 </dt>
3215 <dd>
3216 <p>
3217 When run from a subdirectory of the project, it can be
3218 told to exclude changes outside the directory and show
3219 pathnames relative to it with this option. When you are
3220 not in a subdirectory (e.g. in a bare repository), you
3221 can name which subdirectory to make the output relative
3225 </p>
3226 </dd>
3228 -a
3229 </dt>
3231 --text
3232 </dt>
3233 <dd>
3234 <p>
3235 Treat all files as text.
3236 </p>
3237 </dd>
3239 --ignore-cr-at-eol
3240 </dt>
3241 <dd>
3242 <p>
3243 Ignore carriage-return at the end of line when doing a comparison.
3244 </p>
3245 </dd>
3247 --ignore-space-at-eol
3248 </dt>
3249 <dd>
3250 <p>
3251 Ignore changes in whitespace at EOL.
3252 </p>
3253 </dd>
3255 -b
3256 </dt>
3258 --ignore-space-change
3259 </dt>
3260 <dd>
3261 <p>
3262 Ignore changes in amount of whitespace. This ignores whitespace
3263 at line end, and considers all other sequences of one or
3264 more whitespace characters to be equivalent.
3265 </p>
3266 </dd>
3268 -w
3269 </dt>
3271 --ignore-all-space
3272 </dt>
3273 <dd>
3274 <p>
3275 Ignore whitespace when comparing lines. This ignores
3276 differences even if one line has whitespace where the other
3277 line has none.
3278 </p>
3279 </dd>
3281 --ignore-blank-lines
3282 </dt>
3283 <dd>
3284 <p>
3285 Ignore changes whose lines are all blank.
3286 </p>
3287 </dd>
3290 </dt>
3293 </dt>
3294 <dd>
3295 <p>
3297 be specified more than once.
3298 </p>
3299 </dd>
3302 </dt>
3303 <dd>
3304 <p>
3305 Show the context between diff hunks, up to the specified number
3306 of lines, thereby fusing hunks that are close to each other.
3308 is unset.
3309 </p>
3310 </dd>
3312 -W
3313 </dt>
3315 --function-context
3316 </dt>
3317 <dd>
3318 <p>
3319 Show whole function as context lines for each change.
3320 The function names are determined in the same way as
3323 </p>
3324 </dd>
3326 --ext-diff
3327 </dt>
3328 <dd>
3329 <p>
3330 Allow an external diff helper to be executed. If you set an
3333 </p>
3334 </dd>
3336 --no-ext-diff
3337 </dt>
3338 <dd>
3339 <p>
3340 Disallow external diff drivers.
3341 </p>
3342 </dd>
3344 --textconv
3345 </dt>
3347 --no-textconv
3348 </dt>
3349 <dd>
3350 <p>
3351 Allow (or disallow) external text conversion filters to be run
3353 details. Because textconv filters are typically a one-way
3354 conversion, the resulting diff is suitable for human
3355 consumption, but cannot be applied. For this reason, textconv
3357 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
3358 diff plumbing commands.
3359 </p>
3360 </dd>
3363 </dt>
3364 <dd>
3365 <p>
3368 Using "none" will consider the submodule modified when it either contains
3369 untracked or modified files or its HEAD differs from the commit recorded
3370 in the superproject and can be used to override any settings of the
3371 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
3372 "untracked" is used submodules are not considered dirty when they only
3373 contain untracked content (but they are still scanned for modified
3374 content). Using "dirty" ignores all changes to the work tree of submodules,
3375 only changes to the commits stored in the superproject are shown (this was
3377 </p>
3378 </dd>
3381 </dt>
3382 <dd>
3383 <p>
3384 Show the given source prefix instead of "a/".
3385 </p>
3386 </dd>
3389 </dt>
3390 <dd>
3391 <p>
3392 Show the given destination prefix instead of "b/".
3393 </p>
3394 </dd>
3396 --no-prefix
3397 </dt>
3398 <dd>
3399 <p>
3400 Do not show any source or destination prefix.
3401 </p>
3402 </dd>
3404 --default-prefix
3405 </dt>
3406 <dd>
3407 <p>
3412 </p>
3413 </dd>
3416 </dt>
3417 <dd>
3418 <p>
3419 Prepend an additional prefix to every line of output.
3420 </p>
3421 </dd>
3423 --ita-invisible-in-index
3424 </dt>
3425 <dd>
3426 <p>
3427 By default entries added by "git add -N" appear as an existing
3429 This option makes the entry appear as a new file in "git diff"
3430 and non-existent in "git diff --cached". This option could be
3432 experimental and could be removed in future.
3433 </p>
3434 </dd>
3435 </dl></div>
3438 </div>
3439 </div>
3451 You can customize the creation of patch text via the
3453 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
3454 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
3455 diff format:</p></div>
3457 <li>
3458 <p>
3459 It is preceded by a "git diff" header that looks like this:
3460 </p>
3464 </div></div>
3465 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
3466 involved. Especially, even for a creation or a deletion,
3467 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
3468 <div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
3469 name of the source file of the rename/copy and the name of
3470 the file that the rename/copy produces, respectively.</p></div>
3471 </li>
3472 <li>
3473 <p>
3474 It is followed by one or more extended header lines:
3475 </p>
3489 </div></div>
3490 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
3491 and file permission bits.</p></div>
3492 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
3494 the dissimilarity index is the percentage of changed lines. It
3495 is a rounded down integer, followed by a percent sign. The
3496 similarity index value of 100% is thus reserved for two equal
3497 files, while 100% dissimilarity means that no line from the old
3498 file made it into the new one.</p></div>
3499 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
3501 separate lines indicate the old and the new mode.</p></div>
3502 </li>
3503 <li>
3504 <p>
3505 Pathnames with "unusual" characters are quoted as explained for
3508 </p>
3509 </li>
3510 <li>
3511 <p>
3514 It is incorrect to apply each change to each file sequentially. For
3515 example, this patch will swap a and b:
3516 </p>
3519 <pre><code>diff --git a/a b/b
3520 rename from a
3521 rename to b
3522 diff --git a/b b/a
3523 rename from b
3524 rename to a</code></pre>
3525 </div></div>
3526 </li>
3527 <li>
3528 <p>
3529 Hunk headers mention the name of the function to which the hunk
3530 applies. See "Defining a custom hunk-header" in
3532 specific languages.
3533 </p>
3534 </li>
3535 </ol></div>
3536 </div>
3537 </div>
3541 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
3546 diffs in a specific format.</p></div>
3550 <pre><code>diff --combined describe.c
3551 index fabadb8,cc95eb0..4866510
3552 --- a/describe.c
3553 +++ b/describe.c
3556 }
3558 - static void describe(char *arg)
3559 -static void describe(struct commit *cmit, int last_one)
3560 ++static void describe(char *arg, int last_one)
3561 {
3562 + unsigned char sha1[20];
3563 + struct commit *cmit;
3564 struct commit_list *list;
3565 static int initialized = 0;
3566 struct commit_name *n;
3569 + usage(describe_usage);
3570 + cmit = lookup_commit_reference(sha1);
3571 + if (!cmit)
3572 + usage(describe_usage);
3573 +
3574 if (!initialized) {
3575 initialized = 1;
3576 for_each_ref(get_name);</code></pre>
3577 </div></div>
3579 <li>
3580 <p>
3581 It is preceded by a "git diff" header, that looks like
3583 </p>
3587 </div></div>
3592 </div></div>
3593 </li>
3594 <li>
3595 <p>
3596 It is followed by one or more extended header lines
3597 (this example shows a merge with two parents):
3598 </p>
3605 </div></div>
3606 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
3608 information about detected content movement (renames and
3609 copying detection) are designed to work with the diff of two
3611 </li>
3612 <li>
3613 <p>
3614 It is followed by a two-line from-file/to-file header:
3615 </p>
3618 <pre><code>--- a/file
3619 +++ b/file</code></pre>
3620 </div></div>
3621 <div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
3623 files.</p></div>
3624 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
3625 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
3626 where N is the number of parents in the merge commit:</p></div>
3629 <pre><code>--- a/file
3630 --- a/file
3631 --- a/file
3632 +++ b/file</code></pre>
3633 </div></div>
3635 active, to allow you to see the original name of the file in different
3636 parents.</p></div>
3637 </li>
3638 <li>
3639 <p>
3640 Chunk header format is modified to prevent people from
3642 was created for review of merge commit changes, and was not
3643 meant to be applied. The change is similar to the change in the
3645 </p>
3648 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
3649 </div></div>
3650 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
3651 header for combined diff format.</p></div>
3652 </li>
3653 </ol></div>
3655 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
3657 compares two or more files file1, file2,… with one file X, and
3658 shows how X differs from each of fileN. One column for each of
3659 fileN is prepended to the output line to note how X’s line is
3660 different from it.</p></div>
3661 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
3663 in the column N means that the line appears in the result,
3664 and fileN does not have that line (in other words, the line was
3665 added, from the point of view of that parent).</p></div>
3669 in either file1 or file2). Also, eight other lines are the same
3671 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
3672 merge commit with the merge result (i.e. file1..fileN are the
3674 two unresolved merge parents with the working tree file
3677 </div>
3678 </div>
3685 </dt>
3686 <dd>
3687 <p>
3689 points at.
3690 </p>
3691 </dd>
3694 </dt>
3695 <dd>
3696 <p>
3698 </p>
3699 </dd>
3702 </dt>
3703 <dd>
3704 <p>
3705 Shows the subject of the commit pointed to by the
3707 </p>
3708 </dd>
3711 </dt>
3712 <dd>
3713 <p>
3715 they were current in the 10th last commit of the branch
3717 </p>
3718 </dd>
3721 </dt>
3722 <dd>
3723 <p>
3724 Concatenates the contents of said Makefiles in the head
3726 </p>
3727 </dd>
3728 </dl></div>
3729 </div>
3730 </div>
3736 <li>
3737 <p>
3738 The contents of the blob objects are uninterpreted sequences
3739 of bytes. There is no encoding translation at the core
3740 level.
3741 </p>
3742 </li>
3743 <li>
3744 <p>
3745 Path names are encoded in UTF-8 normalization form C. This
3746 applies to tree objects, the index file, ref names, as well as
3747 path names in command line arguments, environment variables
3749 <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and
3751 </p>
3753 sequences of non-NUL bytes, there are no path name encoding
3754 conversions (except on Mac and Windows). Therefore, using
3755 non-ASCII path names will mostly work even on platforms and file
3756 systems that use legacy extended ASCII encodings. However,
3757 repositories created on such systems will not work properly on
3758 UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa.
3759 Additionally, many Git-based tools simply assume path names to
3761 </li>
3762 <li>
3763 <p>
3764 Commit log messages are typically encoded in UTF-8, but other
3765 extended ASCII encodings are also supported. This includes
3767 EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5,
3768 EUC-x, CP9xx etc.).
3769 </p>
3770 </li>
3771 </ul></div>
3773 in UTF-8, both the core and Git Porcelain are designed not to
3774 force UTF-8 on projects. If all participants of a particular
3775 project find it more convenient to use legacy encodings, Git
3776 does not forbid it. However, there are a few things to keep in
3777 mind.</p></div>
3779 <li>
3780 <p>
3782 a warning if the commit log message given to it does not look
3783 like a valid UTF-8 string, unless you explicitly say your
3784 project uses a legacy encoding. The way to say this is to
3786 </p>
3789 <pre><code>[i18n]
3791 </div></div>
3794 help other people who look at them later. Lack of this header
3796 </li>
3797 <li>
3798 <p>
3801 log message into UTF-8 unless otherwise specified. You can
3802 specify the desired output encoding with
3804 </p>
3807 <pre><code>[i18n]
3809 </div></div>
3812 </li>
3813 </ol></div>
3815 message when a commit is made to force UTF-8 at the commit
3816 object level, because re-coding to UTF-8 is not necessarily a
3817 reversible operation.</p></div>
3818 </div>
3819 </div>
3824 </div>
3825 </div>
3826 </div>
3830 Last updated
3832 </div>
3833 </div>
3834 </body>
3835 </html>