| blob | bdf1a1aa2cd300223d6ff6d77ff9a54eec1d9002 |
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-log(1) Manual Page
739 </h1>
742 <p>git-log -
743 Show commit logs
744 </p>
745 </div>
746 </div>
752 <pre class="content"><em>git log</em> [<options>] [<revision-range>] [[--] <path>…]</pre>
754 </div></div>
755 </div>
756 </div>
761 <div class="paragraph"><p>List commits that are reachable by following the <code>parent</code> links from the
762 given commit(s), but exclude commits that are reachable from the one(s)
764 chronological order by default.</p></div>
765 <div class="paragraph"><p>You can think of this as a set operation. Commits reachable from any of
766 the commits given on the command line form a set, and then commits reachable
768 set. The remaining commits are what comes out in the command’s output.
769 Various other options and paths parameters can be used to further limit the
770 result.</p></div>
775 </div></div>
776 <div class="paragraph"><p>means "list all the commits which are reachable from <em>foo</em> or <em>bar</em>, but
778 <div class="paragraph"><p>A special notation "<em><commit1></em>..<em><commit2></em>" can be used as a
779 short-hand for "^<em><commit1></em> <em><commit2></em>". For example, either of
780 the following may be used interchangeably:</p></div>
783 <pre><code>$ git log origin..HEAD
784 $ git log HEAD ^origin</code></pre>
785 </div></div>
786 <div class="paragraph"><p>Another special notation is "<em><commit1></em>…<em><commit2></em>" which is useful
787 for merges. The resulting set of commits is the symmetric difference
788 between the two operands. The following two commands are equivalent:</p></div>
791 <pre><code>$ git log A B --not $(git merge-base --all A B)
792 $ git log A...B</code></pre>
793 </div></div>
794 <div class="paragraph"><p>The command takes options applicable to the <a href="git-rev-list.html">git-rev-list(1)</a>
795 command to control what is shown and how, and options applicable to
797 each commit introduces are shown.</p></div>
798 </div>
799 </div>
805 --follow
806 </dt>
807 <dd>
808 <p>
809 Continue listing the history of a file beyond renames
810 (works only for a single file).
811 </p>
812 </dd>
814 --no-decorate
815 </dt>
817 --decorate[=short|full|auto|no]
818 </dt>
819 <dd>
820 <p>
825 specified, then if the output is going to a terminal, the ref names
830 </p>
831 </dd>
834 </dt>
837 </dt>
838 <dd>
839 <p>
840 For each candidate reference, do not use it for decoration if it
846 </p>
847 <div class="paragraph"><p>If none of these options or config settings are given, then references are
848 used as decoration if they match <code>HEAD</code>, <code>refs/heads/</code>, <code>refs/remotes/</code>,
850 </dd>
852 --clear-decorations
853 </dt>
854 <dd>
855 <p>
858 decoration filter to include all references. This option is
861 </p>
862 </dd>
864 --source
865 </dt>
866 <dd>
867 <p>
868 Print out the ref name given on the command line by which each
869 commit was reached.
870 </p>
871 </dd>
873 --[no-]mailmap
874 </dt>
876 --[no-]use-mailmap
877 </dt>
878 <dd>
879 <p>
880 Use mailmap file to map author and committer names and email
881 addresses to canonical real names and email addresses. See
883 </p>
884 </dd>
886 --full-diff
887 </dt>
888 <dd>
889 <p>
891 touch the specified paths, and diffs about the same specified
892 paths. With this, the full diff is shown for commits that touch
893 the specified paths; this means that "<path>…" limits only
894 commits, and doesn’t limit diff for those commits.
895 </p>
898 </dd>
900 --log-size
901 </dt>
902 <dd>
903 <p>
907 output by allowing them to allocate space in advance.
908 </p>
909 </dd>
912 </dt>
915 </dt>
916 <dd>
917 <p>
919 or by the function name regex <em><funcname></em>, within the <em><file></em>. You may
920 not give any pathspec limiters. This is currently limited to
921 a walk starting from a single revision, i.e., you may only
922 give zero or one positive revision arguments, and
923 <em><start></em> and <em><end></em> (or <em><funcname></em>) must exist in the starting revision.
926 (namely <code>--raw</code>, <code>--numstat</code>, <code>--shortstat</code>, <code>--dirstat</code>, <code>--summary</code>,
927 <code>--name-only</code>, <code>--name-status</code>, <code>--check</code>) are not currently implemented.
928 </p>
929 <div class="paragraph"><p><em><start></em> and <em><end></em> can take one of these forms:</p></div>
931 <li>
932 <p>
933 number
934 </p>
935 <div class="paragraph"><p>If <em><start></em> or <em><end></em> is a number, it specifies an
937 </li>
938 <li>
939 <p>
941 </p>
948 </li>
949 <li>
950 <p>
951 +offset or -offset
952 </p>
955 </li>
956 </ul></div>
957 <div class="paragraph"><p>If <code>:<funcname></code> is given in place of <em><start></em> and <em><end></em>, it is a
958 regular expression that denotes the range from the first funcname line
959 that matches <em><funcname></em>, up to the next funcname line. <code>:<funcname></code>
965 </dd>
968 </dt>
969 <dd>
970 <p>
971 Show only commits in the specified revision range. When no
974 specifies all the commits reachable from the current commit
978 </p>
979 </dd>
982 </dt>
983 <dd>
984 <p>
985 Show only commits that are enough to explain how the files
986 that match the specified paths came to be. See <em>History
987 Simplification</em> below for details and other simplification
988 modes.
989 </p>
990 <div class="paragraph"><p>Paths may need to be prefixed with <code>--</code> to separate them from
991 options or the revision range, when confusion arises.</p></div>
992 </dd>
993 </dl></div>
997 special notations explained in the description, additional commit
998 limiting may be applied.</p></div>
1000 <code>--since=<date1></code> limits to commits newer than <code><date1></code>, and using it
1008 </dt>
1011 </dt>
1014 </dt>
1015 <dd>
1016 <p>
1017 Limit the number of commits to output.
1018 </p>
1019 </dd>
1022 </dt>
1023 <dd>
1024 <p>
1026 </p>
1027 </dd>
1030 </dt>
1033 </dt>
1034 <dd>
1035 <p>
1036 Show commits more recent than a specific date.
1037 </p>
1038 </dd>
1041 </dt>
1042 <dd>
1043 <p>
1044 Show all commits more recent than a specific date. This visits
1045 all commits in the range, rather than stopping at the first commit which
1046 is older than a specific date.
1047 </p>
1048 </dd>
1051 </dt>
1054 </dt>
1055 <dd>
1056 <p>
1057 Show commits older than a specific date.
1058 </p>
1059 </dd>
1062 </dt>
1065 </dt>
1066 <dd>
1067 <p>
1068 Limit the commits output to ones with author/committer
1069 header lines that match the specified pattern (regular
1071 commits whose author matches any of the given patterns are
1073 </p>
1074 </dd>
1077 </dt>
1078 <dd>
1079 <p>
1080 Limit the commits output to ones with reflog entries that
1081 match the specified pattern (regular expression). With
1083 matches any of the given patterns are chosen. It is an
1085 </p>
1086 </dd>
1089 </dt>
1090 <dd>
1091 <p>
1092 Limit the commits output to ones with a log message that
1093 matches the specified pattern (regular expression). With
1095 matches any of the given patterns are chosen (but see
1097 </p>
1098 <div class="paragraph"><p>When <code>--notes</code> is in effect, the message from the notes is
1099 matched as if it were part of the log message.</p></div>
1100 </dd>
1102 --all-match
1103 </dt>
1104 <dd>
1105 <p>
1107 instead of ones that match at least one.
1108 </p>
1109 </dd>
1111 --invert-grep
1112 </dt>
1113 <dd>
1114 <p>
1115 Limit the commits output to ones with a log message that do not
1117 </p>
1118 </dd>
1120 -i
1121 </dt>
1123 --regexp-ignore-case
1124 </dt>
1125 <dd>
1126 <p>
1127 Match the regular expression limiting patterns without regard to letter
1128 case.
1129 </p>
1130 </dd>
1132 --basic-regexp
1133 </dt>
1134 <dd>
1135 <p>
1136 Consider the limiting patterns to be basic regular expressions;
1137 this is the default.
1138 </p>
1139 </dd>
1141 -E
1142 </dt>
1144 --extended-regexp
1145 </dt>
1146 <dd>
1147 <p>
1148 Consider the limiting patterns to be extended regular expressions
1149 instead of the default basic regular expressions.
1150 </p>
1151 </dd>
1153 -F
1154 </dt>
1156 --fixed-strings
1157 </dt>
1158 <dd>
1159 <p>
1160 Consider the limiting patterns to be fixed strings (don’t interpret
1161 pattern as a regular expression).
1162 </p>
1163 </dd>
1165 -P
1166 </dt>
1168 --perl-regexp
1169 </dt>
1170 <dd>
1171 <p>
1172 Consider the limiting patterns to be Perl-compatible regular
1173 expressions.
1174 </p>
1176 compile-time dependency. If Git wasn’t compiled with support for them
1177 providing this option will cause it to die.</p></div>
1178 </dd>
1180 --remove-empty
1181 </dt>
1182 <dd>
1183 <p>
1184 Stop when a given path disappears from the tree.
1185 </p>
1186 </dd>
1188 --merges
1189 </dt>
1190 <dd>
1191 <p>
1193 </p>
1194 </dd>
1196 --no-merges
1197 </dt>
1198 <dd>
1199 <p>
1200 Do not print commits with more than one parent. This is
1202 </p>
1203 </dd>
1206 </dt>
1209 </dt>
1211 --no-min-parents
1212 </dt>
1214 --no-max-parents
1215 </dt>
1216 <dd>
1217 <p>
1218 Show only commits which have at least (or at most) that many parent
1220 <code>--min-parents=2</code> is the same as <code>--merges</code>. <code>--max-parents=0</code>
1222 </p>
1223 <div class="paragraph"><p><code>--no-min-parents</code> and <code>--no-max-parents</code> reset these limits (to no limit)
1226 </dd>
1228 --first-parent
1229 </dt>
1230 <dd>
1231 <p>
1232 When finding commits to include, follow only the first
1233 parent commit upon seeing a merge commit. This option
1234 can give a better overview when viewing the evolution of
1235 a particular topic branch, because merges into a topic
1236 branch tend to be only about adjusting to updated upstream
1237 from time to time, and this option allows you to ignore
1238 the individual commits brought in to your history by such
1239 a merge.
1240 </p>
1242 to <code>first-parent</code>, see <code>--diff-merges=first-parent</code> for details.</p></div>
1243 </dd>
1245 --exclude-first-parent-only
1246 </dt>
1247 <dd>
1248 <p>
1250 the first parent commit upon seeing a merge commit.
1251 This can be used to find the set of changes in a topic branch
1252 from the point where it diverged from the remote branch, given
1253 that arbitrary merges can be valid topic branch changes.
1254 </p>
1255 </dd>
1257 --not
1258 </dt>
1259 <dd>
1260 <p>
1263 When used on the command line before --stdin, the revisions passed
1264 through stdin will not be affected by it. Conversely, when passed
1265 via standard input, the revisions passed on the command line will
1266 not be affected by it.
1267 </p>
1268 </dd>
1270 --all
1271 </dt>
1272 <dd>
1273 <p>
1276 </p>
1277 </dd>
1280 </dt>
1281 <dd>
1282 <p>
1287 </p>
1288 </dd>
1291 </dt>
1292 <dd>
1293 <p>
1298 </p>
1299 </dd>
1302 </dt>
1303 <dd>
1304 <p>
1307 remote-tracking branches to ones matching given shell glob.
1308 If pattern lacks <em>?</em>, <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.
1309 </p>
1310 </dd>
1313 </dt>
1314 <dd>
1315 <p>
1320 </p>
1321 </dd>
1324 </dt>
1325 <dd>
1326 <p>
1328 <code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or <code>--glob</code> would otherwise
1329 consider. Repetitions of this option accumulate exclusion patterns
1330 up to the next <code>--all</code>, <code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or
1332 accumulated patterns).
1333 </p>
1334 <div class="paragraph"><p>The patterns given should not begin with <code>refs/heads</code>, <code>refs/tags</code>, or
1335 <code>refs/remotes</code> when applied to <code>--branches</code>, <code>--tags</code>, or <code>--remotes</code>,
1338 explicitly.</p></div>
1339 </dd>
1341 --exclude-hidden=[fetch|receive|uploadpack]
1342 </dt>
1343 <dd>
1344 <p>
1351 </p>
1352 </dd>
1354 --reflog
1355 </dt>
1356 <dd>
1357 <p>
1358 Pretend as if all objects mentioned by reflogs are listed on the
1360 </p>
1361 </dd>
1363 --alternate-refs
1364 </dt>
1365 <dd>
1366 <p>
1367 Pretend as if all objects mentioned as ref tips of alternate
1368 repositories were listed on the command line. An alternate
1369 repository is any repository whose object directory is specified
1373 </p>
1374 </dd>
1376 --single-worktree
1377 </dt>
1378 <dd>
1379 <p>
1380 By default, all working trees will be examined by the
1381 following options when there are more than one (see
1382 <a href="git-worktree.html">git-worktree(1)</a>): <code>--all</code>, <code>--reflog</code> and
1384 This option forces them to examine the current working tree
1385 only.
1386 </p>
1387 </dd>
1389 --ignore-missing
1390 </dt>
1391 <dd>
1392 <p>
1393 Upon seeing an invalid object name in the input, pretend as if
1394 the bad input was not given.
1395 </p>
1396 </dd>
1398 --bisect
1399 </dt>
1400 <dd>
1401 <p>
1405 line.
1406 </p>
1407 </dd>
1409 --stdin
1410 </dt>
1411 <dd>
1412 <p>
1413 In addition to getting arguments from the command line, read
1414 them from standard input as well. This accepts commits and
1415 pseudo-options like <code>--all</code> and <code>--glob=</code>. When a <code>--</code> separator
1416 is seen, the following input is treated as paths and used to
1418 are only respected for arguments passed in the same way and will not
1419 influence any subsequent command line arguments.
1420 </p>
1421 </dd>
1423 --cherry-mark
1424 </dt>
1425 <dd>
1426 <p>
1429 </p>
1430 </dd>
1432 --cherry-pick
1433 </dt>
1434 <dd>
1435 <p>
1436 Omit any commit that introduces the same change as
1438 commits are limited with symmetric difference.
1439 </p>
1440 <div class="paragraph"><p>For example, if you have two branches, <code>A</code> and <code>B</code>, a usual way
1441 to list all commits on only one side of them is with
1445 cherry-picked from branch A). With this option, such pairs of commits are
1446 excluded from the output.</p></div>
1447 </dd>
1449 --left-only
1450 </dt>
1452 --right-only
1453 </dt>
1454 <dd>
1455 <p>
1456 List only commits on the respective side of a symmetric difference,
1459 </p>
1460 <div class="paragraph"><p>For example, <code>--cherry-pick --right-only A...B</code> omits those
1462 <code>A</code>. In other words, this lists the <code>+</code> commits from <code>git cherry A B</code>.
1464 list.</p></div>
1465 </dd>
1467 --cherry
1468 </dt>
1469 <dd>
1470 <p>
1472 limit the output to the commits on our side and mark those that
1473 have been applied to the other side of a forked history with
1476 </p>
1477 </dd>
1479 -g
1480 </dt>
1482 --walk-reflogs
1483 </dt>
1484 <dd>
1485 <p>
1486 Instead of walking the commit ancestry chain, walk
1487 reflog entries from the most recent one to older ones.
1488 When this option is used you cannot specify commits to
1491 </p>
1492 <div class="paragraph"><p>With <code>--pretty</code> format other than <code>oneline</code> and <code>reference</code> (for obvious reasons),
1493 this causes the output to have two extra lines of information
1494 taken from the reflog. The reflog designator in the output may be shown
1497 depending on a few rules:</p></div>
1501 <li>
1502 <p>
1504 format.
1505 </p>
1506 </li>
1507 <li>
1508 <p>
1510 timestamp format.
1511 </p>
1512 </li>
1513 <li>
1514 <p>
1517 </p>
1518 </li>
1519 <li>
1520 <p>
1521 Otherwise, show the index format.
1522 </p>
1523 </li>
1524 </ol></div>
1525 </div></div>
1527 prefixed with this information on the same line.
1530 <div class="paragraph"><p>Under <code>--pretty=reference</code>, this information will not be shown at all.</p></div>
1531 </dd>
1533 --merge
1534 </dt>
1535 <dd>
1536 <p>
1537 After a failed merge, show refs that touch files having a
1538 conflict and don’t exist on all heads to merge.
1539 </p>
1540 </dd>
1542 --boundary
1543 </dt>
1544 <dd>
1545 <p>
1546 Output excluded boundary commits. Boundary commits are
1548 </p>
1549 </dd>
1550 </dl></div>
1551 </div>
1554 <div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the
1557 is how to do it, as there are various strategies to simplify the history.</p></div>
1562 </dt>
1563 <dd>
1564 <p>
1566 </p>
1567 </dd>
1569 --simplify-by-decoration
1570 </dt>
1571 <dd>
1572 <p>
1573 Commits that are referred by some branch or tag are selected.
1574 </p>
1575 </dd>
1576 </dl></div>
1577 <div class="paragraph"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
1578 <div class="paragraph"><p>The following options affect the way the simplification is performed:</p></div>
1581 Default mode
1582 </dt>
1583 <dd>
1584 <p>
1585 Simplifies the history to the simplest history explaining the
1586 final state of the tree. Simplest because it prunes some side
1587 branches if the end result is the same (i.e. merging branches
1588 with the same content)
1589 </p>
1590 </dd>
1592 --show-pulls
1593 </dt>
1594 <dd>
1595 <p>
1596 Include all commits from the default mode, but also any merge
1597 commits that are not TREESAME to the first parent but are
1598 TREESAME to a later parent. This mode is helpful for showing
1599 the merge commits that "first introduced" a change to a branch.
1600 </p>
1601 </dd>
1603 --full-history
1604 </dt>
1605 <dd>
1606 <p>
1607 Same as the default mode, but does not prune some history.
1608 </p>
1609 </dd>
1611 --dense
1612 </dt>
1613 <dd>
1614 <p>
1615 Only the selected commits are shown, plus some to have a
1616 meaningful history.
1617 </p>
1618 </dd>
1620 --sparse
1621 </dt>
1622 <dd>
1623 <p>
1624 All commits in the simplified history are shown.
1625 </p>
1626 </dd>
1628 --simplify-merges
1629 </dt>
1630 <dd>
1631 <p>
1633 merges from the resulting history, as there are no selected
1634 commits contributing to this merge.
1635 </p>
1636 </dd>
1639 </dt>
1640 <dd>
1641 <p>
1647 times; if so, a commit is included if it is any of the commits
1648 given or if it is an ancestor or descendant of one of them.
1649 </p>
1650 </dd>
1651 </dl></div>
1653 <div class="paragraph"><p>Suppose you specified <code>foo</code> as the <paths>. We shall call commits
1656 <div class="paragraph"><p>In the following, we will always refer to the same example history to
1657 illustrate the differences between simplification settings. We assume
1661 <pre><code> .-A---M---N---O---P---Q
1662 / / / / / /
1663 I B C D E Y
1664 \ / / / / /
1665 `-------------' X</code></pre>
1666 </div></div>
1667 <div class="paragraph"><p>The horizontal line of history A---Q is taken to be the first parent of
1668 each merge. The commits are:</p></div>
1670 <li>
1671 <p>
1673 “asdf”, and a file <code>quux</code> exists with contents “quux”. Initial
1675 </p>
1676 </li>
1677 <li>
1678 <p>
1680 </p>
1681 </li>
1682 <li>
1683 <p>
1684 <code>B</code> contains the same change as <code>A</code>. Its merge <code>M</code> is trivial and
1685 hence TREESAME to all parents.
1686 </p>
1687 </li>
1688 <li>
1689 <p>
1690 <code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to “foobar”,
1691 so it is not TREESAME to any parent.
1692 </p>
1693 </li>
1694 <li>
1695 <p>
1696 <code>D</code> sets <code>foo</code> to “baz”. Its merge <code>O</code> combines the strings from
1697 <code>N</code> and <code>D</code> to “foobarbaz”; i.e., it is not TREESAME to any parent.
1698 </p>
1699 </li>
1700 <li>
1701 <p>
1702 <code>E</code> changes <code>quux</code> to “xyzzy”, and its merge <code>P</code> combines the
1703 strings to “quux xyzzy”. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.
1704 </p>
1705 </li>
1706 <li>
1707 <p>
1708 <code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
1709 modified it. <code>Y</code> is TREESAME to <code>X</code>. Its merge <code>Q</code> added <code>side</code> to <code>P</code>, and
1711 </p>
1712 </li>
1713 </ul></div>
1714 <div class="paragraph"><p><code>rev-list</code> walks backwards through history, including or excluding
1717 are available.</p></div>
1720 Default mode
1721 </dt>
1722 <dd>
1723 <p>
1724 Commits are included if they are not TREESAME to any parent
1726 commit was a merge, and it was TREESAME to one parent, follow
1727 only that parent. (Even if there are several TREESAME
1728 parents, follow only one of them.) Otherwise, follow all
1729 parents.
1730 </p>
1734 <pre><code> .-A---N---O
1735 / / /
1736 I---------D</code></pre>
1737 </div></div>
1742 <div class="paragraph"><p>Parent/child relations are only visible with <code>--parents</code>, but that does
1743 not affect the commits selected in default mode, so we have shown the
1744 parent lines.</p></div>
1745 </dd>
1747 --full-history without parent rewriting
1748 </dt>
1749 <dd>
1750 <p>
1751 This mode differs from the default in one point: always follow
1752 all parents of a merge, even if it is TREESAME to one of them.
1753 Even if more than one side of the merge has commits that are
1754 included, this does not imply that the merge itself is! In
1755 the example, we get
1756 </p>
1760 </div></div>
1761 <div class="paragraph"><p><code>M</code> was excluded because it is TREESAME to both parents. <code>E</code>,
1762 <code>C</code> and <code>B</code> were all walked, but only <code>B</code> was !TREESAME, so the others
1763 do not appear.</p></div>
1764 <div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk
1765 about the parent/child relationships between the commits, so we show
1766 them disconnected.</p></div>
1767 </dd>
1769 --full-history with parent rewriting
1770 </dt>
1771 <dd>
1772 <p>
1773 Ordinary commits are only included if they are !TREESAME
1775 </p>
1777 Along each parent, prune away commits that are not included
1778 themselves. This results in</p></div>
1781 <pre><code> .-A---M---N---O---P---Q
1782 / / / / /
1783 I B / D /
1784 \ / / / /
1785 `-------------'</code></pre>
1786 </div></div>
1787 <div class="paragraph"><p>Compare to <code>--full-history</code> without rewriting above. Note that <code>E</code>
1788 was pruned away because it is TREESAME, but the parent list of P was
1789 rewritten to contain <code>E</code>'s parent <code>I</code>. The same happened for <code>C</code> and
1791 </dd>
1792 </dl></div>
1794 affects inclusion:</p></div>
1797 --dense
1798 </dt>
1799 <dd>
1800 <p>
1801 Commits that are walked are included if they are not TREESAME
1802 to any parent.
1803 </p>
1804 </dd>
1806 --sparse
1807 </dt>
1808 <dd>
1809 <p>
1810 All commits that are walked are included.
1811 </p>
1812 <div class="paragraph"><p>Note that without <code>--full-history</code>, this still simplifies merges: if
1813 one of the parents is TREESAME, we follow only that one, so the other
1814 sides of the merge are never walked.</p></div>
1815 </dd>
1817 --simplify-merges
1818 </dt>
1819 <dd>
1820 <p>
1821 First, build a history graph in the same way that
1823 </p>
1824 <div class="paragraph"><p>Then simplify each commit <code>C</code> to its replacement <code>C'</code> in the final
1825 history according to the following rules:</p></div>
1829 <li>
1830 <p>
1832 </p>
1833 </li>
1834 <li>
1835 <p>
1836 Replace each parent <code>P</code> of <code>C'</code> with its simplification <code>P'</code>. In
1837 the process, drop parents that are ancestors of other parents or that are
1838 root commits TREESAME to an empty tree, and remove duplicates, but take care
1839 to never drop all parents that we are TREESAME to.
1840 </p>
1841 </li>
1842 <li>
1843 <p>
1846 Otherwise, it is replaced with its only parent.
1847 </p>
1848 </li>
1849 </ul></div>
1850 </div></div>
1855 <pre><code> .-A---M---N---O
1856 / / /
1857 I B D
1858 \ / /
1859 `---------'</code></pre>
1860 </div></div>
1861 <div class="paragraph"><p>Note the major differences in <code>N</code>, <code>P</code>, and <code>Q</code> over <code>--full-history</code>:</p></div>
1865 <li>
1866 <p>
1869 </p>
1870 </li>
1871 <li>
1872 <p>
1874 removed completely, because it had one parent and is TREESAME.
1875 </p>
1876 </li>
1877 <li>
1878 <p>
1879 <code>Q</code>'s parent list had <code>Y</code> simplified to <code>X</code>. <code>X</code> was then removed, because it
1881 parent and is TREESAME.
1882 </p>
1883 </li>
1884 </ul></div>
1885 </div></div>
1886 </dd>
1887 </dl></div>
1892 </dt>
1893 <dd>
1894 <p>
1895 Limit the displayed commits to those which are an ancestor of
1897 itself.
1898 </p>
1899 <div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
1902 <pre><code> D---E-------F
1903 / \ \
1904 B---C---G---H---I---J
1905 / \
1906 A-------K---------------L--M</code></pre>
1907 </div></div>
1908 <div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
1911 that “what does <code>M</code> have that did not exist in <code>D</code>”. The result in this
1912 example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
1913 of course).</p></div>
1914 <div class="paragraph"><p>When we want to find out what commits in <code>M</code> are contaminated with the
1917 excluding <code>C</code> and <code>K</code>. This is exactly what the <code>--ancestry-path</code>
1921 <pre><code> E-------F
1922 \ \
1923 G---H---I---J
1924 \
1925 L--M</code></pre>
1926 </div></div>
1927 <div class="paragraph"><p>We can also use <code>--ancestry-path=D</code> instead of <code>--ancestry-path</code> which
1929 explicit.</p></div>
1930 <div class="paragraph"><p>If we instead are interested in a given topic within this range, and all
1931 commits affected by that topic, we may only want to view the subset of
1936 <pre><code> E
1937 \
1938 G---H---I---J
1939 \
1940 L--M</code></pre>
1941 </div></div>
1942 <div class="paragraph"><p>Whereas <code>--ancestry-path=K D..M</code> would result in</p></div>
1946 </div></div>
1947 </dd>
1948 </dl></div>
1949 <div class="paragraph"><p>Before discussing another option, <code>--show-pulls</code>, we need to
1950 create a new example history.</p></div>
1951 <div class="paragraph"><p>A common problem users face when looking at simplified history is that a
1952 commit they know changed a file somehow does not appear in the file’s
1953 simplified history. Let’s demonstrate a new example and show how options
1954 such as <code>--full-history</code> and <code>--simplify-merges</code> works in that case:</p></div>
1957 <pre><code> .-A---M-----C--N---O---P
1958 / / \ \ \/ / /
1959 I B \ R-'`-Z' /
1960 \ / \/ /
1961 \ / /\ /
1962 `---X--' `---Y--'</code></pre>
1963 </div></div>
1964 <div class="paragraph"><p>For this example, suppose <code>I</code> created <code>file.txt</code> which was modified by
1965 <code>A</code>, <code>B</code>, and <code>X</code> in different ways. The single-parent commits <code>C</code>, <code>Z</code>,
1966 and <code>Y</code> do not change <code>file.txt</code>. The merge commit <code>M</code> was created by
1970 the contents of <code>file.txt</code> at <code>X</code>. Hence, <code>R</code> is TREESAME to <code>X</code> but not
1972 contents of <code>file.txt</code> at <code>R</code>, so <code>N</code> is TREESAME to <code>R</code> but not <code>C</code>.
1975 <div class="paragraph"><p>When using the default mode, <code>N</code> and <code>R</code> both have a TREESAME parent, so
1976 those edges are walked and the others are ignored. The resulting history
1977 graph is:</p></div>
1981 </div></div>
1982 <div class="paragraph"><p>When using <code>--full-history</code>, Git walks every edge. This will discover
1983 the commits <code>A</code> and <code>B</code> and the merge <code>M</code>, but also will reveal the
1984 merge commits <code>O</code> and <code>P</code>. With parent rewriting, the resulting graph is:</p></div>
1987 <pre><code> .-A---M--------N---O---P
1988 / / \ \ \/ / /
1989 I B \ R-'`--' /
1990 \ / \/ /
1991 \ / /\ /
1992 `---X--' `------'</code></pre>
1993 </div></div>
1994 <div class="paragraph"><p>Here, the merge commits <code>O</code> and <code>P</code> contribute extra noise, as they did
1997 issue in repositories using a workflow where many contributors work in
1998 parallel and merge their topic branches along a single trunk: many
2000 <div class="paragraph"><p>When using the <code>--simplify-merges</code> option, the commits <code>O</code> and <code>P</code>
2001 disappear from the results. This is because the rewritten second parents
2003 removed and then the commits look like single-parent commits that are
2005 in a history view as follows:</p></div>
2008 <pre><code> .-A---M--.
2009 / / \
2010 I B R
2011 \ / /
2012 \ / /
2013 `---X--'</code></pre>
2014 </div></div>
2016 <code>A</code>, <code>B</code>, and <code>X</code>. We also see the carefully-resolved merge <code>M</code> and the
2019 the default view. However, there are a few issues with this approach.</p></div>
2022 before returning a single result. This can make the option difficult to
2023 use for very large repositories.</p></div>
2024 <div class="paragraph"><p>The second issue is one of auditing. When many contributors are working
2025 on the same repository, it is important which merge commits introduced
2027 not likely to be the merge commit that was used to merge into an
2028 important branch. Instead, the merge <code>N</code> was used to merge <code>R</code> and <code>X</code>
2029 into the important branch. This commit may have information about why
2030 the change <code>X</code> came to override the changes from <code>A</code> and <code>B</code> in its
2031 commit message.</p></div>
2034 --show-pulls
2035 </dt>
2036 <dd>
2037 <p>
2038 In addition to the commits shown in the default history, show
2039 each merge commit that is not TREESAME to its first parent but
2040 is TREESAME to a later parent.
2041 </p>
2042 <div class="paragraph"><p>When a merge commit is included by <code>--show-pulls</code>, the merge is
2043 treated as if it "pulled" the change from another branch. When using
2045 graph is:</p></div>
2049 </div></div>
2050 <div class="paragraph"><p>Here, the merge commits <code>R</code> and <code>N</code> are included because they pulled
2053 default history.</p></div>
2054 <div class="paragraph"><p>When <code>--show-pulls</code> is paired with <code>--simplify-merges</code>, the
2055 graph includes all of the necessary information:</p></div>
2058 <pre><code> .-A---M--. N
2059 / / \ /
2060 I B R
2061 \ / /
2062 \ / /
2063 `---X--'</code></pre>
2064 </div></div>
2065 <div class="paragraph"><p>Notice that since <code>M</code> is reachable from <code>R</code>, the edge from <code>N</code> to <code>M</code>
2068 branch.</p></div>
2069 </dd>
2070 </dl></div>
2071 <div class="paragraph"><p>The <code>--simplify-by-decoration</code> option allows you to view only the
2072 big picture of the topology of the history, by omitting commits
2073 that are not referenced by tags. Commits are marked as !TREESAME
2074 (in other words, kept after history simplification rules described
2076 contents of the paths given on the command line. All other
2077 commits are marked as TREESAME (subject to be simplified away).</p></div>
2078 </div>
2081 <div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>
2084 --date-order
2085 </dt>
2086 <dd>
2087 <p>
2088 Show no parents before all of its children are shown, but
2089 otherwise show commits in the commit timestamp order.
2090 </p>
2091 </dd>
2093 --author-date-order
2094 </dt>
2095 <dd>
2096 <p>
2097 Show no parents before all of its children are shown, but
2098 otherwise show commits in the author timestamp order.
2099 </p>
2100 </dd>
2102 --topo-order
2103 </dt>
2104 <dd>
2105 <p>
2106 Show no parents before all of its children are shown, and
2107 avoid showing commits on multiple lines of history
2108 intermixed.
2109 </p>
2114 \ \
2116 </div></div>
2120 <div class="paragraph"><p>With <code>--topo-order</code>, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
2121 3 1); some older commits are shown before newer ones in order to
2122 avoid showing the commits from two parallel development track mixed
2123 together.</p></div>
2124 </dd>
2126 --reverse
2127 </dt>
2128 <dd>
2129 <p>
2130 Output the commits chosen to be shown (see Commit Limiting
2131 section above) in reverse order. Cannot be combined with
2133 </p>
2134 </dd>
2135 </dl></div>
2136 </div>
2139 <div class="paragraph"><p>These options are mostly targeted for packing of Git repositories.</p></div>
2142 --no-walk[=(sorted|unsorted)]
2143 </dt>
2144 <dd>
2145 <p>
2146 Only show the given commits, but do not traverse their ancestors.
2147 This has no effect if a range is specified. If the argument
2150 was given), the commits are shown in reverse chronological order
2151 by commit time.
2153 </p>
2154 </dd>
2156 --do-walk
2157 </dt>
2158 <dd>
2159 <p>
2161 </p>
2162 </dd>
2163 </dl></div>
2164 </div>
2170 </dt>
2173 </dt>
2174 <dd>
2175 <p>
2176 Pretty-print the contents of the commit logs in a given format,
2178 <em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:<string></em>
2182 </p>
2183 <div class="paragraph"><p>See the "PRETTY FORMATS" section for some additional details for each
2184 format. When <em>=<format></em> part is omitted, it defaults to <em>medium</em>.</p></div>
2187 </dd>
2189 --abbrev-commit
2190 </dt>
2191 <dd>
2192 <p>
2193 Instead of showing the full 40-byte hexadecimal commit object
2194 name, show a prefix that names the object uniquely.
2195 "--abbrev=<n>" (which also modifies diff output, if it is displayed)
2196 option can be used to specify the minimum length of the prefix.
2197 </p>
2200 </dd>
2202 --no-abbrev-commit
2203 </dt>
2204 <dd>
2205 <p>
2206 Show the full 40-byte hexadecimal commit object name. This negates
2209 </p>
2210 </dd>
2212 --oneline
2213 </dt>
2214 <dd>
2215 <p>
2216 This is a shorthand for "--pretty=oneline --abbrev-commit"
2217 used together.
2218 </p>
2219 </dd>
2222 </dt>
2223 <dd>
2224 <p>
2225 Commit objects record the character encoding used for the log message
2226 in their encoding header; this option can be used to tell the
2227 command to re-code the commit log message in the encoding
2228 preferred by the user. For non plumbing commands this
2229 defaults to UTF-8. Note that if an object claims to be encoded
2231 verbatim; this means that invalid sequences in the original
2232 commit may be copied to the output. Likewise, if iconv(3) fails
2233 to convert the commit, we will quietly output the original
2234 object verbatim.
2235 </p>
2236 </dd>
2239 </dt>
2241 --expand-tabs
2242 </dt>
2244 --no-expand-tabs
2245 </dt>
2246 <dd>
2247 <p>
2248 Perform a tab expansion (replace each tab with enough spaces
2250 in the log message before showing it in the output.
2253 which disables tab expansion.
2254 </p>
2258 </dd>
2261 </dt>
2262 <dd>
2263 <p>
2265 commit, when showing the commit log message. This is the default
2267 there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given
2268 on the command line.
2269 </p>
2272 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
2273 <div class="paragraph"><p>With an optional <em><ref></em> argument, use the ref to find the notes
2274 to display. The ref can specify the full refname when it begins
2275 with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
2278 being displayed. Examples: "--notes=foo" will show only notes from
2281 </dd>
2283 --no-notes
2284 </dt>
2285 <dd>
2286 <p>
2288 resetting the list of notes refs from which notes are shown.
2289 Options are parsed in the order given on the command line, so e.g.
2290 "--notes --notes=foo --no-notes --notes=bar" will only show notes
2291 from "refs/notes/bar".
2292 </p>
2293 </dd>
2295 --show-notes-by-default
2296 </dt>
2297 <dd>
2298 <p>
2299 Show the default notes unless options for displaying specific
2300 notes are given.
2301 </p>
2302 </dd>
2305 </dt>
2307 --[no-]standard-notes
2308 </dt>
2309 <dd>
2310 <p>
2311 These options are deprecated. Use the above --notes/--no-notes
2312 options instead.
2313 </p>
2314 </dd>
2316 --show-signature
2317 </dt>
2318 <dd>
2319 <p>
2320 Check the validity of a signed commit object by passing the signature
2322 </p>
2323 </dd>
2325 --relative-date
2326 </dt>
2327 <dd>
2328 <p>
2330 </p>
2331 </dd>
2334 </dt>
2335 <dd>
2336 <p>
2337 Only takes effect for dates shown in human-readable format, such
2340 are shown in the original time zone (either committer’s or
2343 </p>
2346 <div class="paragraph"><p><code>--date=relative</code> shows dates relative to the current time,
2349 <div class="paragraph"><p><code>--date=local</code> is an alias for <code>--date=default-local</code>.</p></div>
2350 <div class="paragraph"><p><code>--date=iso</code> (or <code>--date=iso8601</code>) shows timestamps in a ISO 8601-like format.
2353 <li>
2354 <p>
2356 </p>
2357 </li>
2358 <li>
2359 <p>
2360 a space between time and time zone
2361 </p>
2362 </li>
2363 <li>
2364 <p>
2365 no colon between hours and minutes of the time zone
2366 </p>
2367 </li>
2368 </ul></div>
2369 <div class="paragraph"><p><code>--date=iso-strict</code> (or <code>--date=iso8601-strict</code>) shows timestamps in strict
2371 <div class="paragraph"><p><code>--date=rfc</code> (or <code>--date=rfc2822</code>) shows timestamps in RFC 2822
2372 format, often found in email messages.</p></div>
2373 <div class="paragraph"><p><code>--date=short</code> shows only the date, but not the time, in <code>YYYY-MM-DD</code> format.</p></div>
2374 <div class="paragraph"><p><code>--date=raw</code> shows the date as seconds since the epoch (1970-01-01
2377 the second two are minutes). I.e., as if the timestamp were formatted
2380 value (which is always measured in UTC), but does switch the accompanying
2381 timezone value.</p></div>
2382 <div class="paragraph"><p><code>--date=human</code> shows the timezone if the timezone does not match the
2383 current time-zone, and doesn’t print the whole date if that matches
2384 (ie skip printing year for dates that are "this year", but also skip
2385 the whole date itself if it’s in the last few days and we can just say
2386 what weekday it was). For older dates the hour and minute is also
2387 omitted.</p></div>
2388 <div class="paragraph"><p><code>--date=unix</code> shows the date as a Unix epoch timestamp (seconds since
2390 has no effect.</p></div>
2391 <div class="paragraph"><p><code>--date=format:...</code> feeds the format <code>...</code> to your system <code>strftime</code>,
2392 except for %s, %z, and %Z, which are handled internally.
2397 <div class="paragraph"><p><code>--date=default</code> is the default format, and is based on ctime(3)
2398 output. It shows a single line with three-letter day of the week,
2399 three-letter month, day-of-month, hour-minute-seconds in "HH:MM:SS"
2400 format, followed by 4-digit year, plus timezone information, unless
2402 </div></div>
2403 </dd>
2405 --parents
2406 </dt>
2407 <dd>
2408 <p>
2409 Print also the parents of the commit (in the form "commit parent…").
2411 </p>
2412 </dd>
2414 --children
2415 </dt>
2416 <dd>
2417 <p>
2418 Print also the children of the commit (in the form "commit child…").
2420 </p>
2421 </dd>
2423 --left-right
2424 </dt>
2425 <dd>
2426 <p>
2427 Mark which side of a symmetric difference a commit is reachable from.
2431 </p>
2435 <pre><code> y---b---b branch B
2436 / \ /
2437 / .
2438 / / \
2439 o---x---a---a branch A</code></pre>
2440 </div></div>
2444 <pre><code> $ git rev-list --left-right --boundary --pretty=oneline A...B
2450 -yyyyyyy... 1st on b
2452 </div></div>
2453 </dd>
2455 --graph
2456 </dt>
2457 <dd>
2458 <p>
2459 Draw a text-based graphical representation of the commit history
2460 on the left hand side of the output. This may cause extra lines
2461 to be printed in between commits, in order for the graph history
2462 to be drawn properly.
2464 </p>
2465 <div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> above.</p></div>
2466 <div class="paragraph"><p>This implies the <code>--topo-order</code> option by default, but the
2468 </dd>
2471 </dt>
2472 <dd>
2473 <p>
2474 When --graph is not used, all history branches are flattened
2475 which can make it hard to see that the two consecutive commits
2476 do not belong to a linear branch. This option puts a barrier
2478 is the string that will be shown instead of the default one.
2479 </p>
2480 </dd>
2481 </dl></div>
2482 </div>
2483 </div>
2484 </div>
2491 "Merge: " and the hashes of ancestral commits are printed,
2492 separated by spaces. Note that the listed commits may not
2494 have limited your view of history: for example, if you are
2495 only interested in changes related to a certain directory or
2496 file.</p></div>
2499 config option to either another format name, or a
2502 built-in formats:</p></div>
2504 <li>
2505 <p>
2507 </p>
2511 </div></div>
2513 </li>
2514 <li>
2515 <p>
2517 </p>
2522 </div></div>
2526 </div></div>
2527 </li>
2528 <li>
2529 <p>
2531 </p>
2537 </div></div>
2541 </div></div>
2545 </div></div>
2546 </li>
2547 <li>
2548 <p>
2550 </p>
2556 </div></div>
2560 </div></div>
2564 </div></div>
2565 </li>
2566 <li>
2567 <p>
2569 </p>
2577 </div></div>
2581 </div></div>
2585 </div></div>
2586 </li>
2587 <li>
2588 <p>
2590 </p>
2594 </div></div>
2595 <div class="paragraph"><p>This format is used to refer to another commit in a commit message and
2599 placeholders, its output is not affected by other options like
2601 </li>
2602 <li>
2603 <p>
2605 </p>
2612 </div></div>
2616 </div></div>
2617 </li>
2618 <li>
2619 <p>
2621 </p>
2622 <div class="paragraph"><p>Like <em>email</em>, but lines in the commit message starting with "From "
2624 confused as starting a new commit.</p></div>
2625 </li>
2626 <li>
2627 <p>
2629 </p>
2631 stored in the commit object. Notably, the hashes are
2632 displayed in full, regardless of whether --abbrev or
2634 true parent commits, without taking grafts or history
2635 simplification into account. Note that this format affects the way
2636 commits are displayed, but not the way the diff is shown e.g. with
2639 </li>
2640 <li>
2641 <p>
2643 </p>
2644 <div class="paragraph"><p>The <em>format:<format-string></em> format allows you to specify which information
2645 you want to show. It works a little bit like printf format,
2648 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
2649 would show something like this:</p></div>
2653 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</code></pre>
2654 </div></div>
2657 <li>
2658 <p>
2659 Placeholders that expand to a single literal character:
2660 </p>
2664 </dt>
2665 <dd>
2666 <p>
2667 newline
2668 </p>
2669 </dd>
2672 </dt>
2673 <dd>
2674 <p>
2676 </p>
2677 </dd>
2680 </dt>
2681 <dd>
2682 <p>
2684 byte with the hexadecimal digits' value (we will call this
2685 "literal formatting code" in the rest of this document).
2686 </p>
2687 </dd>
2688 </dl></div>
2689 </li>
2690 <li>
2691 <p>
2692 Placeholders that affect formatting of later placeholders:
2693 </p>
2697 </dt>
2698 <dd>
2699 <p>
2700 switch color to red
2701 </p>
2702 </dd>
2705 </dt>
2706 <dd>
2707 <p>
2708 switch color to green
2709 </p>
2710 </dd>
2713 </dt>
2714 <dd>
2715 <p>
2716 switch color to blue
2717 </p>
2718 </dd>
2721 </dt>
2722 <dd>
2723 <p>
2724 reset color
2725 </p>
2726 </dd>
2729 </dt>
2730 <dd>
2731 <p>
2732 color specification, as described under Values in the
2734 default, colors are shown only when enabled for log output
2740 not otherwise enabled (though consider just using
2742 including this format and anything else git might color).
2744 on the next placeholders until the color is switched
2745 again.
2746 </p>
2747 </dd>
2750 </dt>
2751 <dd>
2752 <p>
2754 </p>
2755 </dd>
2758 </dt>
2759 <dd>
2760 <p>
2761 switch line wrapping, like the -w option of
2763 </p>
2764 </dd>
2767 </dt>
2768 <dd>
2769 <p>
2770 make the next placeholder take at
2771 least N column widths, padding spaces on
2772 the right if necessary. Optionally
2776 N columns.
2777 Note 1: that truncating
2779 Note 2: spaces around the N and M (see below)
2780 values are optional.
2781 Note 3: Emojis and other wide characters
2782 will take two display columns, which may
2783 over-run column boundaries.
2784 Note 4: decomposed character combining marks
2785 may be misplaced at padding boundaries.
2786 </p>
2787 </dd>
2790 </dt>
2791 <dd>
2792 <p>
2793 make the next placeholder take at least until Mth
2794 display column, padding spaces on the right if necessary.
2795 Use negative M values for column positions measured
2796 from the right hand edge of the terminal window.
2797 </p>
2798 </dd>
2801 </dt>
2802 <dd>
2803 <p>
2805 but padding spaces on the left
2806 </p>
2807 </dd>
2810 </dt>
2811 <dd>
2812 <p>
2814 respectively, except that if the next
2815 placeholder takes more spaces than given and
2816 there are spaces on its left, use those
2817 spaces
2818 </p>
2819 </dd>
2822 </dt>
2823 <dd>
2824 <p>
2826 respectively, but padding both sides
2827 (i.e. the text is centered)
2828 </p>
2829 </dd>
2830 </dl></div>
2831 </li>
2832 <li>
2833 <p>
2834 Placeholders that expand to information extracted from the commit:
2835 </p>
2839 </dt>
2840 <dd>
2841 <p>
2842 commit hash
2843 </p>
2844 </dd>
2847 </dt>
2848 <dd>
2849 <p>
2850 abbreviated commit hash
2851 </p>
2852 </dd>
2855 </dt>
2856 <dd>
2857 <p>
2858 tree hash
2859 </p>
2860 </dd>
2863 </dt>
2864 <dd>
2865 <p>
2866 abbreviated tree hash
2867 </p>
2868 </dd>
2871 </dt>
2872 <dd>
2873 <p>
2874 parent hashes
2875 </p>
2876 </dd>
2879 </dt>
2880 <dd>
2881 <p>
2882 abbreviated parent hashes
2883 </p>
2884 </dd>
2887 </dt>
2888 <dd>
2889 <p>
2890 author name
2891 </p>
2892 </dd>
2895 </dt>
2896 <dd>
2897 <p>
2900 </p>
2901 </dd>
2904 </dt>
2905 <dd>
2906 <p>
2907 author email
2908 </p>
2909 </dd>
2912 </dt>
2913 <dd>
2914 <p>
2917 </p>
2918 </dd>
2921 </dt>
2922 <dd>
2923 <p>
2925 </p>
2926 </dd>
2929 </dt>
2930 <dd>
2931 <p>
2934 </p>
2935 </dd>
2938 </dt>
2939 <dd>
2940 <p>
2941 author date (format respects --date= option)
2942 </p>
2943 </dd>
2946 </dt>
2947 <dd>
2948 <p>
2949 author date, RFC2822 style
2950 </p>
2951 </dd>
2954 </dt>
2955 <dd>
2956 <p>
2957 author date, relative
2958 </p>
2959 </dd>
2962 </dt>
2963 <dd>
2964 <p>
2965 author date, UNIX timestamp
2966 </p>
2967 </dd>
2970 </dt>
2971 <dd>
2972 <p>
2973 author date, ISO 8601-like format
2974 </p>
2975 </dd>
2978 </dt>
2979 <dd>
2980 <p>
2981 author date, strict ISO 8601 format
2982 </p>
2983 </dd>
2986 </dt>
2987 <dd>
2988 <p>
2990 </p>
2991 </dd>
2994 </dt>
2995 <dd>
2996 <p>
2999 </p>
3000 </dd>
3003 </dt>
3004 <dd>
3005 <p>
3006 committer name
3007 </p>
3008 </dd>
3011 </dt>
3012 <dd>
3013 <p>
3014 committer name (respecting .mailmap, see
3016 </p>
3017 </dd>
3020 </dt>
3021 <dd>
3022 <p>
3023 committer email
3024 </p>
3025 </dd>
3028 </dt>
3029 <dd>
3030 <p>
3031 committer email (respecting .mailmap, see
3033 </p>
3034 </dd>
3037 </dt>
3038 <dd>
3039 <p>
3041 </p>
3042 </dd>
3045 </dt>
3046 <dd>
3047 <p>
3050 </p>
3051 </dd>
3054 </dt>
3055 <dd>
3056 <p>
3057 committer date (format respects --date= option)
3058 </p>
3059 </dd>
3062 </dt>
3063 <dd>
3064 <p>
3065 committer date, RFC2822 style
3066 </p>
3067 </dd>
3070 </dt>
3071 <dd>
3072 <p>
3073 committer date, relative
3074 </p>
3075 </dd>
3078 </dt>
3079 <dd>
3080 <p>
3081 committer date, UNIX timestamp
3082 </p>
3083 </dd>
3086 </dt>
3087 <dd>
3088 <p>
3089 committer date, ISO 8601-like format
3090 </p>
3091 </dd>
3094 </dt>
3095 <dd>
3096 <p>
3097 committer date, strict ISO 8601 format
3098 </p>
3099 </dd>
3102 </dt>
3103 <dd>
3104 <p>
3106 </p>
3107 </dd>
3110 </dt>
3111 <dd>
3112 <p>
3115 </p>
3116 </dd>
3119 </dt>
3120 <dd>
3121 <p>
3123 </p>
3124 </dd>
3127 </dt>
3128 <dd>
3129 <p>
3131 </p>
3132 </dd>
3135 </dt>
3136 <dd>
3137 <p>
3139 colon and zero or more comma-separated options. Option values may contain
3142 </p>
3144 <li>
3145 <p>
3146 <em>prefix=<value></em>: Shown before the list of ref names. Defaults to " <code>(</code>".
3147 </p>
3148 </li>
3149 <li>
3150 <p>
3151 <em>suffix=<value></em>: Shown after the list of ref names. Defaults to "<code>)</code>".
3152 </p>
3153 </li>
3154 <li>
3155 <p>
3157 </p>
3158 </li>
3159 <li>
3160 <p>
3162 Defaults to " <code>-></code> ".
3163 </p>
3164 </li>
3165 <li>
3166 <p>
3168 </p>
3169 </li>
3170 </ul></div>
3172 or tag annotations, and spaces as separators:</p></div>
3174 </dd>
3177 </dt>
3178 <dd>
3179 <p>
3182 zero or more comma-separated options. Descriptions can be inconsistent when
3183 tags are added or removed at the same time.
3184 </p>
3186 <li>
3187 <p>
3189 consider lightweight tags as well.
3190 </p>
3191 </li>
3192 <li>
3193 <p>
3195 (which will vary according to the number of objects in the repository with a
3197 digits as needed to form a unique object name.
3198 </p>
3199 </li>
3200 <li>
3201 <p>
3204 </p>
3205 </li>
3206 <li>
3207 <p>
3210 </p>
3211 </li>
3212 </ul></div>
3213 </dd>
3216 </dt>
3217 <dd>
3218 <p>
3219 ref name given on the command line by which the commit was reached
3221 </p>
3222 </dd>
3225 </dt>
3226 <dd>
3227 <p>
3228 encoding
3229 </p>
3230 </dd>
3233 </dt>
3234 <dd>
3235 <p>
3236 subject
3237 </p>
3238 </dd>
3241 </dt>
3242 <dd>
3243 <p>
3244 sanitized subject line, suitable for a filename
3245 </p>
3246 </dd>
3249 </dt>
3250 <dd>
3251 <p>
3252 body
3253 </p>
3254 </dd>
3257 </dt>
3258 <dd>
3259 <p>
3260 raw body (unwrapped subject and body)
3261 </p>
3262 </dd>
3265 </dt>
3266 <dd>
3267 <p>
3268 commit notes
3269 </p>
3270 </dd>
3273 </dt>
3274 <dd>
3275 <p>
3276 raw verification message from GPG for a signed commit
3277 </p>
3278 </dd>
3281 </dt>
3282 <dd>
3283 <p>
3284 show "G" for a good (valid) signature,
3285 "B" for a bad signature,
3286 "U" for a good signature with unknown validity,
3287 "X" for a good signature that has expired,
3288 "Y" for a good signature made by an expired key,
3289 "R" for a good signature made by a revoked key,
3290 "E" if the signature cannot be checked (e.g. missing key)
3291 and "N" for no signature
3292 </p>
3293 </dd>
3296 </dt>
3297 <dd>
3298 <p>
3299 show the name of the signer for a signed commit
3300 </p>
3301 </dd>
3304 </dt>
3305 <dd>
3306 <p>
3307 show the key used to sign a signed commit
3308 </p>
3309 </dd>
3312 </dt>
3313 <dd>
3314 <p>
3315 show the fingerprint of the key used to sign a signed commit
3316 </p>
3317 </dd>
3320 </dt>
3321 <dd>
3322 <p>
3323 show the fingerprint of the primary key whose subkey was used
3324 to sign a signed commit
3325 </p>
3326 </dd>
3329 </dt>
3330 <dd>
3331 <p>
3332 show the trust level for the key used to sign a signed commit
3333 </p>
3334 </dd>
3337 </dt>
3338 <dd>
3339 <p>
3341 minutes ago}</code>; the format follows the rules described for the
3345 </p>
3346 </dd>
3349 </dt>
3350 <dd>
3351 <p>
3353 portion is shortened for human readability (so
3355 </p>
3356 </dd>
3359 </dt>
3360 <dd>
3361 <p>
3362 reflog identity name
3363 </p>
3364 </dd>
3367 </dt>
3368 <dd>
3369 <p>
3370 reflog identity name (respecting .mailmap, see
3372 </p>
3373 </dd>
3376 </dt>
3377 <dd>
3378 <p>
3379 reflog identity email
3380 </p>
3381 </dd>
3384 </dt>
3385 <dd>
3386 <p>
3387 reflog identity email (respecting .mailmap, see
3389 </p>
3390 </dd>
3393 </dt>
3394 <dd>
3395 <p>
3396 reflog subject
3397 </p>
3398 </dd>
3401 </dt>
3402 <dd>
3403 <p>
3404 display the trailers of the body as interpreted by
3405 <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
3406 a colon and zero or more comma-separated options. If any option is provided
3407 multiple times, the last occurrence wins.
3408 </p>
3410 <li>
3411 <p>
3413 case-insensitively and trailing colon is optional. If option is
3414 given multiple times trailer lines matching any of the keys are
3416 non-trailer lines in the trailer block are hidden. If that is not
3420 </p>
3421 </li>
3422 <li>
3423 <p>
3425 block should be included.
3426 </p>
3427 </li>
3428 <li>
3429 <p>
3431 lines. When this option is not given each trailer line is
3433 the literal formatting codes described above. To use comma as
3436 shows all trailer lines whose key is "Ticket" separated by a comma
3437 and a space.
3438 </p>
3439 </li>
3440 <li>
3441 <p>
3442 <em>unfold[=<bool>]</em>: make it behave as if interpret-trailer’s <code>--unfold</code>
3443 option was given. E.g.,
3445 </p>
3446 </li>
3447 <li>
3448 <p>
3450 </p>
3451 </li>
3452 <li>
3453 <p>
3455 </p>
3456 </li>
3457 <li>
3458 <p>
3460 trailer lines. When this option is not given each trailer key-value
3461 pair is separated by ": ". Otherwise it shares the same semantics
3463 </p>
3464 </li>
3465 </ul></div>
3466 </dd>
3467 </dl></div>
3468 </li>
3469 </ul></div>
3470 </li>
3471 </ul></div>
3473 <table><tr>
3476 </td>
3479 insert an empty string unless we are traversing reflog entries (e.g., by
3480 <code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
3482 line.</td>
3483 </tr></table>
3484 </div>
3485 <div class="paragraph"><p>The boolean options accept an optional value <code>[=<bool-value>]</code>. The values
3486 <code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
3489 <div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
3490 is inserted immediately before the expansion if and only if the
3491 placeholder expands to a non-empty string.</p></div>
3492 <div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
3493 line-feeds immediately preceding the expansion are deleted if and only if the
3494 placeholder expands to an empty string.</p></div>
3496 is inserted immediately before the expansion if and only if the
3497 placeholder expands to a non-empty string.</p></div>
3499 <li>
3500 <p>
3502 </p>
3503 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
3505 other words, each commit has the message terminator character (usually a
3506 newline) appended, rather than a separator placed between entries.
3507 This means that the final entry of a single-line format will be properly
3508 terminated with a new line, just as the "oneline" format does.
3509 For example:</p></div>
3513 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
3514 4da45be
3515 7134973 -- NO NEWLINE
3518 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
3519 4da45be
3521 </div></div>
3522 <div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
3524 equivalent:</p></div>
3529 </div></div>
3530 </li>
3531 </ul></div>
3532 </div>
3533 </div>
3537 <div class="paragraph"><p>By default, <code>git log</code> does not generate any diff output. The options
3538 below can be used to show the changes made by each commit.</p></div>
3539 <div class="paragraph"><p>Note that unless one of <code>--diff-merges</code> variants (including short
3540 <code>-m</code>, <code>-c</code>, <code>--cc</code>, and <code>--dd</code> options) is explicitly given, merge commits
3544 the default format for merge commits.</p></div>
3547 -p
3548 </dt>
3550 -u
3551 </dt>
3553 --patch
3554 </dt>
3555 <dd>
3556 <p>
3558 </p>
3559 </dd>
3561 -s
3562 </dt>
3564 --no-patch
3565 </dt>
3566 <dd>
3567 <p>
3568 Suppress all output from the diff machinery. Useful for
3570 squelch their output, or to cancel the effect of options like
3572 </p>
3573 </dd>
3575 -m
3576 </dt>
3577 <dd>
3578 <p>
3579 Show diffs for merge commits in the default format. This is
3582 </p>
3583 </dd>
3585 -c
3586 </dt>
3587 <dd>
3588 <p>
3589 Produce combined diff output for merge commits.
3591 </p>
3592 </dd>
3594 --cc
3595 </dt>
3596 <dd>
3597 <p>
3598 Produce dense combined diff output for merge commits.
3600 </p>
3601 </dd>
3603 --dd
3604 </dt>
3605 <dd>
3606 <p>
3607 Produce diff with respect to first parent for both merge and
3608 regular commits.
3610 </p>
3611 </dd>
3613 --remerge-diff
3614 </dt>
3615 <dd>
3616 <p>
3617 Produce remerge-diff output for merge commits.
3619 </p>
3620 </dd>
3622 --no-diff-merges
3623 </dt>
3624 <dd>
3625 <p>
3627 </p>
3628 </dd>
3631 </dt>
3632 <dd>
3633 <p>
3634 Specify diff format to be used for merge commits. Default is
3637 </p>
3643 off, none
3644 </dt>
3645 <dd>
3646 <p>
3647 Disable output of diffs for merge commits. Useful to override
3648 implied value.
3649 </p>
3650 </dd>
3652 on, m
3653 </dt>
3654 <dd>
3655 <p>
3656 Make diff output for merge commits to be shown in the default
3657 format. The default format can be changed using
3660 </p>
3661 </dd>
3663 first-parent, 1
3664 </dt>
3665 <dd>
3666 <p>
3667 Show full diff with respect to first parent. This is the same
3669 </p>
3670 </dd>
3672 separate
3673 </dt>
3674 <dd>
3675 <p>
3676 Show full diff with respect to each of parents.
3677 Separate log entry and diff is generated for each parent.
3678 </p>
3679 </dd>
3681 combined, c
3682 </dt>
3683 <dd>
3684 <p>
3685 Show differences from each of the parents to the merge
3686 result simultaneously instead of showing pairwise diff between
3687 a parent and the result one at a time. Furthermore, it lists
3688 only files which were modified from all parents.
3689 </p>
3690 </dd>
3692 dense-combined, cc
3693 </dt>
3694 <dd>
3695 <p>
3697 by omitting uninteresting hunks whose contents in the parents
3698 have only two variants and the merge result picks one of them
3699 without modification.
3700 </p>
3701 </dd>
3703 remerge, r
3704 </dt>
3705 <dd>
3706 <p>
3707 Remerge two-parent merge commits to create a temporary tree
3708 object—potentially containing files with conflict markers
3709 and such. A diff is then shown between that temporary tree
3710 and the actual merge commit.
3711 </p>
3712 <div class="paragraph"><p>The output emitted when this option is used is subject to change, and
3713 so is its interaction with other options (unless explicitly
3714 documented).</p></div>
3715 </dd>
3716 </dl></div>
3717 </div></div>
3718 </dd>
3720 --combined-all-paths
3721 </dt>
3722 <dd>
3723 <p>
3724 This flag causes combined diffs (used for merge commits) to
3725 list the name of the file from all parents. It thus only has
3727 is likely only useful if filename changes are detected (i.e.
3728 when either rename or copy detection have been requested).
3729 </p>
3730 </dd>
3733 </dt>
3736 </dt>
3737 <dd>
3738 <p>
3740 the usual three.
3742 </p>
3743 </dd>
3746 </dt>
3747 <dd>
3748 <p>
3749 Output to a specific file instead of stdout.
3750 </p>
3751 </dd>
3754 </dt>
3757 </dt>
3760 </dt>
3761 <dd>
3762 <p>
3763 Specify the character used to indicate new, old or context
3765 ' ' respectively.
3766 </p>
3767 </dd>
3769 --raw
3770 </dt>
3771 <dd>
3772 <p>
3773 For each commit, show a summary of changes using the raw diff
3774 format. See the "RAW OUTPUT FORMAT" section of
3776 itself in raw format, which you can achieve with
3778 </p>
3779 </dd>
3781 --patch-with-raw
3782 </dt>
3783 <dd>
3784 <p>
3786 </p>
3787 </dd>
3789 -t
3790 </dt>
3791 <dd>
3792 <p>
3793 Show the tree objects in the diff output.
3794 </p>
3795 </dd>
3797 --indent-heuristic
3798 </dt>
3799 <dd>
3800 <p>
3801 Enable the heuristic that shifts diff hunk boundaries to make patches
3802 easier to read. This is the default.
3803 </p>
3804 </dd>
3806 --no-indent-heuristic
3807 </dt>
3808 <dd>
3809 <p>
3810 Disable the indent heuristic.
3811 </p>
3812 </dd>
3814 --minimal
3815 </dt>
3816 <dd>
3817 <p>
3818 Spend extra time to make sure the smallest possible
3819 diff is produced.
3820 </p>
3821 </dd>
3823 --patience
3824 </dt>
3825 <dd>
3826 <p>
3827 Generate a diff using the "patience diff" algorithm.
3828 </p>
3829 </dd>
3831 --histogram
3832 </dt>
3833 <dd>
3834 <p>
3835 Generate a diff using the "histogram diff" algorithm.
3836 </p>
3837 </dd>
3840 </dt>
3841 <dd>
3842 <p>
3843 Generate a diff using the "anchored diff" algorithm.
3844 </p>
3846 <div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
3847 and starts with this text, this algorithm attempts to prevent it from
3848 appearing as a deletion or addition in the output. It uses the "patience
3850 </dd>
3852 --diff-algorithm={patience|minimal|histogram|myers}
3853 </dt>
3854 <dd>
3855 <p>
3856 Choose a diff algorithm. The variants are as follows:
3857 </p>
3863 </dt>
3864 <dd>
3865 <p>
3866 The basic greedy diff algorithm. Currently, this is the default.
3867 </p>
3868 </dd>
3871 </dt>
3872 <dd>
3873 <p>
3874 Spend extra time to make sure the smallest possible diff is
3875 produced.
3876 </p>
3877 </dd>
3880 </dt>
3881 <dd>
3882 <p>
3883 Use "patience diff" algorithm when generating patches.
3884 </p>
3885 </dd>
3888 </dt>
3889 <dd>
3890 <p>
3891 This algorithm extends the patience algorithm to "support
3892 low-occurrence common elements".
3893 </p>
3894 </dd>
3895 </dl></div>
3896 </div></div>
3897 <div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
3898 non-default value and want to use the default one, then you
3900 </dd>
3903 </dt>
3904 <dd>
3905 <p>
3906 Generate a diffstat. By default, as much space as necessary
3907 will be used for the filename part, and the rest for the graph
3908 part. Maximum width defaults to terminal width, or 80 columns
3909 if not connected to a terminal, and can be overridden by
3920 </p>
3921 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
3922 <code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
3923 </dd>
3925 --compact-summary
3926 </dt>
3927 <dd>
3928 <p>
3929 Output a condensed summary of extended header information such
3932 or removing executable bit respectively) in diffstat. The
3933 information is put between the filename part and the graph
3935 </p>
3936 </dd>
3938 --numstat
3939 </dt>
3940 <dd>
3941 <p>
3943 deleted lines in decimal notation and pathname without
3944 abbreviation, to make it more machine friendly. For
3947 </p>
3948 </dd>
3950 --shortstat
3951 </dt>
3952 <dd>
3953 <p>
3955 number of modified files, as well as number of added and deleted
3956 lines.
3957 </p>
3958 </dd>
3961 </dt>
3964 </dt>
3965 <dd>
3966 <p>
3967 Output the distribution of relative amount of changes for each
3969 passing it a comma separated list of parameters.
3972 The following parameters are available:
3973 </p>
3979 </dt>
3980 <dd>
3981 <p>
3982 Compute the dirstat numbers by counting the lines that have been
3983 removed from the source, or added to the destination. This ignores
3984 the amount of pure code movements within a file. In other words,
3985 rearranging lines in a file is not counted as much as other changes.
3986 This is the default behavior when no parameter is given.
3987 </p>
3988 </dd>
3991 </dt>
3992 <dd>
3993 <p>
3994 Compute the dirstat numbers by doing the regular line-based diff
3995 analysis, and summing the removed/added line counts. (For binary
3996 files, count 64-byte chunks instead, since binary files have no
3999 lines within a file as much as other changes. The resulting output
4001 </p>
4002 </dd>
4005 </dt>
4006 <dd>
4007 <p>
4008 Compute the dirstat numbers by counting the number of files changed.
4009 Each changed file counts equally in the dirstat analysis. This is
4011 not have to look at the file contents at all.
4012 </p>
4013 </dd>
4016 </dt>
4017 <dd>
4018 <p>
4019 Count changes in a child directory for the parent directory as well.
4021 reported may exceed 100%. The default (non-cumulative) behavior can
4023 </p>
4024 </dd>
4027 </dt>
4028 <dd>
4029 <p>
4030 An integer parameter specifies a cut-off percent (3% by default).
4031 Directories contributing less than this percentage of the changes
4032 are not shown in the output.
4033 </p>
4034 </dd>
4035 </dl></div>
4036 </div></div>
4038 directories with less than 10% of the total amount of changed files,
4039 and accumulating child directory counts in the parent directories:
4041 </dd>
4043 --cumulative
4044 </dt>
4045 <dd>
4046 <p>
4047 Synonym for --dirstat=cumulative
4048 </p>
4049 </dd>
4052 </dt>
4053 <dd>
4054 <p>
4055 Synonym for --dirstat=files,param1,param2…
4056 </p>
4057 </dd>
4059 --summary
4060 </dt>
4061 <dd>
4062 <p>
4063 Output a condensed summary of extended header information
4064 such as creations, renames and mode changes.
4065 </p>
4066 </dd>
4068 --patch-with-stat
4069 </dt>
4070 <dd>
4071 <p>
4073 </p>
4074 </dd>
4076 -z
4077 </dt>
4078 <dd>
4079 <p>
4080 Separate the commits with NULs instead of newlines.
4081 </p>
4082 <div class="paragraph"><p>Also, when <code>--raw</code> or <code>--numstat</code> has been given, do not munge
4083 pathnames and use NULs as output field terminators.</p></div>
4084 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
4087 </dd>
4089 --name-only
4090 </dt>
4091 <dd>
4092 <p>
4093 Show only names of changed files. The file names are often encoded in UTF-8.
4094 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
4095 manual page.
4096 </p>
4097 </dd>
4099 --name-status
4100 </dt>
4101 <dd>
4102 <p>
4103 Show only names and status of changed files. See the description
4106 </p>
4107 </dd>
4110 </dt>
4111 <dd>
4112 <p>
4113 Specify how differences in submodules are shown. When specifying
4115 shows the names of the commits at the beginning and end of the range.
4117 format is used. This format lists the commits in the range like
4118 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
4120 inline diff of the changes in the submodule contents between the
4122 if the config option is unset.
4123 </p>
4124 </dd>
4127 </dt>
4128 <dd>
4129 <p>
4130 Show colored diff.
4131 <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
4132 <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
4133 </p>
4134 </dd>
4136 --no-color
4137 </dt>
4138 <dd>
4139 <p>
4140 Turn off colored diff.
4142 </p>
4143 </dd>
4146 </dt>
4147 <dd>
4148 <p>
4149 Moved lines of code are colored differently.
4152 The mode must be one of:
4153 </p>
4158 no
4159 </dt>
4160 <dd>
4161 <p>
4162 Moved lines are not highlighted.
4163 </p>
4164 </dd>
4166 default
4167 </dt>
4168 <dd>
4169 <p>
4171 in the future.
4172 </p>
4173 </dd>
4175 plain
4176 </dt>
4177 <dd>
4178 <p>
4179 Any line that is added in one location and was removed
4182 that are added somewhere else in the diff. This mode picks up any
4183 moved line, but it is not very useful in a review to determine
4184 if a block of code was moved without permutation.
4185 </p>
4186 </dd>
4188 blocks
4189 </dt>
4190 <dd>
4191 <p>
4192 Blocks of moved text of at least 20 alphanumeric characters
4193 are detected greedily. The detected blocks are
4195 Adjacent blocks cannot be told apart.
4196 </p>
4197 </dd>
4199 zebra
4200 </dt>
4201 <dd>
4202 <p>
4206 the two colors indicates that a new block was detected.
4207 </p>
4208 </dd>
4210 dimmed-zebra
4211 </dt>
4212 <dd>
4213 <p>
4215 of moved code is performed. The bordering lines of two adjacent
4216 blocks are considered interesting, the rest is uninteresting.
4218 </p>
4219 </dd>
4220 </dl></div>
4221 </div></div>
4222 </dd>
4224 --no-color-moved
4225 </dt>
4226 <dd>
4227 <p>
4228 Turn off move detection. This can be used to override configuration
4230 </p>
4231 </dd>
4234 </dt>
4235 <dd>
4236 <p>
4237 This configures how whitespace is ignored when performing the
4239 These modes can be given as a comma separated list:
4240 </p>
4245 no
4246 </dt>
4247 <dd>
4248 <p>
4249 Do not ignore whitespace when performing move detection.
4250 </p>
4251 </dd>
4253 ignore-space-at-eol
4254 </dt>
4255 <dd>
4256 <p>
4257 Ignore changes in whitespace at EOL.
4258 </p>
4259 </dd>
4261 ignore-space-change
4262 </dt>
4263 <dd>
4264 <p>
4265 Ignore changes in amount of whitespace. This ignores whitespace
4266 at line end, and considers all other sequences of one or
4267 more whitespace characters to be equivalent.
4268 </p>
4269 </dd>
4271 ignore-all-space
4272 </dt>
4273 <dd>
4274 <p>
4275 Ignore whitespace when comparing lines. This ignores differences
4276 even if one line has whitespace where the other line has none.
4277 </p>
4278 </dd>
4280 allow-indentation-change
4281 </dt>
4282 <dd>
4283 <p>
4284 Initially ignore any whitespace in the move detection, then
4285 group the moved code blocks only into a block if the change in
4286 whitespace is the same per line. This is incompatible with the
4287 other modes.
4288 </p>
4289 </dd>
4290 </dl></div>
4291 </div></div>
4292 </dd>
4294 --no-color-moved-ws
4295 </dt>
4296 <dd>
4297 <p>
4298 Do not ignore whitespace when performing move detection. This can be
4299 used to override configuration settings. It is the same as
4301 </p>
4302 </dd>
4305 </dt>
4306 <dd>
4307 <p>
4309 By default, words are delimited by whitespace; see
4311 must be one of:
4312 </p>
4317 color
4318 </dt>
4319 <dd>
4320 <p>
4322 </p>
4323 </dd>
4325 plain
4326 </dt>
4327 <dd>
4328 <p>
4330 attempts to escape the delimiters if they appear in the input,
4331 so the output may be ambiguous.
4332 </p>
4333 </dd>
4335 porcelain
4336 </dt>
4337 <dd>
4338 <p>
4339 Use a special line-based format intended for script
4340 consumption. Added/removed/unchanged runs are printed in the
4342 character at the beginning of the line and extending to the
4343 end of the line. Newlines in the input are represented by a
4345 </p>
4346 </dd>
4348 none
4349 </dt>
4350 <dd>
4351 <p>
4352 Disable word diff again.
4353 </p>
4354 </dd>
4355 </dl></div>
4356 </div></div>
4358 highlight the changed parts in all modes if enabled.</p></div>
4359 </dd>
4362 </dt>
4363 <dd>
4364 <p>
4366 runs of non-whitespace to be a word. Also implies
4368 </p>
4371 considered whitespace and ignored(!) for the purposes of finding
4373 expression to make sure that it matches all non-whitespace characters.
4374 A match that contains a newline is silently truncated(!) at the
4375 newline.</p></div>
4376 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
4377 and, correspondingly, show differences character by character.</p></div>
4378 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
4379 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
4380 overrides any diff driver or configuration setting. Diff drivers
4381 override configuration settings.</p></div>
4382 </dd>
4385 </dt>
4386 <dd>
4387 <p>
4390 </p>
4391 </dd>
4393 --no-renames
4394 </dt>
4395 <dd>
4396 <p>
4397 Turn off rename detection, even when the configuration
4398 file gives the default to do so.
4399 </p>
4400 </dd>
4402 --[no-]rename-empty
4403 </dt>
4404 <dd>
4405 <p>
4406 Whether to use empty blobs as rename source.
4407 </p>
4408 </dd>
4410 --check
4411 </dt>
4412 <dd>
4413 <p>
4414 Warn if changes introduce conflict markers or whitespace errors.
4416 configuration. By default, trailing whitespaces (including
4417 lines that consist solely of whitespaces) and a space character
4418 that is immediately followed by a tab character inside the
4419 initial indent of the line are considered whitespace errors.
4420 Exits with non-zero status if problems are found. Not compatible
4421 with --exit-code.
4422 </p>
4423 </dd>
4426 </dt>
4427 <dd>
4428 <p>
4430 lines of the diff. Multiple values are separated by comma,
4433 this option is not given, and the configuration variable
4437 </p>
4438 </dd>
4440 --full-index
4441 </dt>
4442 <dd>
4443 <p>
4444 Instead of the first handful of characters, show the full
4445 pre- and post-image blob object names on the "index"
4446 line when generating patch format output.
4447 </p>
4448 </dd>
4450 --binary
4451 </dt>
4452 <dd>
4453 <p>
4457 </p>
4458 </dd>
4461 </dt>
4462 <dd>
4463 <p>
4464 Instead of showing the full 40-byte hexadecimal object
4465 name in diff-raw format output and diff-tree header
4467 hexdigits long that uniquely refers the object.
4472 </p>
4473 </dd>
4476 </dt>
4479 </dt>
4480 <dd>
4481 <p>
4482 Break complete rewrite changes into pairs of delete and
4483 create. This serves two purposes:
4484 </p>
4485 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
4486 not as a series of deletion and insertion mixed together with a very
4487 few lines that happen to match textually as the context, but as a
4488 single deletion of everything old followed by a single insertion of
4491 original should remain in the result for Git to consider it a total
4492 rewrite (i.e. otherwise the resulting patch will be a series of
4493 deletion and insertion mixed together with context lines).</p></div>
4494 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
4495 source of a rename (usually -M only considers a file that disappeared
4499 eligible for being picked up as a possible source of a rename to
4500 another file.</p></div>
4501 </dd>
4504 </dt>
4507 </dt>
4508 <dd>
4509 <p>
4510 If generating diffs, detect and report renames for each commit.
4511 For following files across renames while traversing history, see
4514 index (i.e. amount of addition/deletions compared to the
4516 delete/add pair to be a rename if more than 90% of the file
4522 </p>
4523 </dd>
4526 </dt>
4529 </dt>
4530 <dd>
4531 <p>
4534 </p>
4535 </dd>
4537 --find-copies-harder
4538 </dt>
4539 <dd>
4540 <p>
4542 if the original file of the copy was modified in the same
4543 changeset. This flag makes the command
4544 inspect unmodified files as candidates for the source of
4545 copy. This is a very expensive operation for large
4546 projects, so use it with caution. Giving more than one
4548 </p>
4549 </dd>
4551 -D
4552 </dt>
4554 --irreversible-delete
4555 </dt>
4556 <dd>
4557 <p>
4558 Omit the preimage for deletes, i.e. print only the header but not
4561 solely for people who want to just concentrate on reviewing the
4562 text after the change. In addition, the output obviously lacks
4563 enough information to apply such a patch in reverse, even manually,
4564 hence the name of the option.
4565 </p>
4566 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
4567 of a delete/create pair.</p></div>
4568 </dd>
4571 </dt>
4572 <dd>
4573 <p>
4575 can detect subsets of renames/copies cheaply, followed by an
4576 exhaustive fallback portion that compares all remaining
4577 unpaired destinations to all relevant sources. (For renames,
4578 only remaining unpaired sources are relevant; for copies, all
4579 original sources are relevant.) For N sources and
4580 destinations, this exhaustive check is O(N^2). This option
4581 prevents the exhaustive portion of rename/copy detection from
4582 running if the number of source/destination files involved
4583 exceeds the specified number. Defaults to diff.renameLimit.
4584 Note that a value of 0 is treated as unlimited.
4585 </p>
4586 </dd>
4588 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
4589 </dt>
4590 <dd>
4591 <p>
4597 Any combination of the filter characters (including none) can be used.
4599 paths are selected if there is any file that matches
4600 other criteria in the comparison; if there is no file
4601 that matches other criteria, nothing is selected.
4602 </p>
4605 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
4606 renamed entries cannot appear if detection for those types is disabled.</p></div>
4607 </dd>
4610 </dt>
4611 <dd>
4612 <p>
4613 Look for differences that change the number of occurrences of
4614 the specified string (i.e. addition/deletion) in a file.
4615 Intended for the scripter’s use.
4616 </p>
4617 <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
4618 struct), and want to know the history of that block since it first
4619 came into being: use the feature iteratively to feed the interesting
4621 very first version of the block.</p></div>
4623 </dd>
4626 </dt>
4627 <dd>
4628 <p>
4629 Look for differences whose patch text contains added/removed
4631 </p>
4632 <div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
4634 file:</p></div>
4638 ...
4640 </div></div>
4641 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
4643 occurrences of that string did not change).</p></div>
4644 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
4645 filter will be ignored.</p></div>
4646 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
4647 information.</p></div>
4648 </dd>
4651 </dt>
4652 <dd>
4653 <p>
4654 Look for differences that change the number of occurrences of
4656 in that it doesn’t search for a specific string but for a specific
4657 object id.
4658 </p>
4659 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
4661 </dd>
4663 --pickaxe-all
4664 </dt>
4665 <dd>
4666 <p>
4668 changeset, not just the files that contain the change
4670 </p>
4671 </dd>
4673 --pickaxe-regex
4674 </dt>
4675 <dd>
4676 <p>
4678 expression to match.
4679 </p>
4680 </dd>
4683 </dt>
4684 <dd>
4685 <p>
4686 Control the order in which files appear in the output.
4690 </p>
4693 All files with pathnames that match the first pattern are output
4694 first, all files with pathnames that match the second pattern (but not
4695 the first) are output next, and so on.
4696 All files with pathnames that do not match any pattern are output
4697 last, as if there was an implicit match-all pattern at the end of the
4698 file.
4699 If multiple pathnames have the same rank (they match the same pattern
4700 but no earlier patterns), their output order relative to each other is
4701 the normal order.</p></div>
4706 <li>
4707 <p>
4708 Blank lines are ignored, so they can be used as separators for
4709 readability.
4710 </p>
4711 </li>
4712 <li>
4713 <p>
4714 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
4715 for comments. Add a backslash ("<code>\</code>") to the beginning of the
4716 pattern if it starts with a hash.
4717 </p>
4718 </li>
4719 <li>
4720 <p>
4721 Each other line contains a single pattern.
4722 </p>
4723 </li>
4724 </ul></div>
4725 </div></div>
4727 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
4728 matches a pattern if removing any number of the final pathname
4729 components matches the pattern. For example, the pattern "<code>foo*bar</code>"
4730 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
4731 </dd>
4734 </dt>
4737 </dt>
4738 <dd>
4739 <p>
4744 otherwise.
4745 </p>
4746 </dd>
4748 -R
4749 </dt>
4750 <dd>
4751 <p>
4752 Swap two inputs; that is, show differences from index or
4753 on-disk file to tree contents.
4754 </p>
4755 </dd>
4758 </dt>
4760 --no-relative
4761 </dt>
4762 <dd>
4763 <p>
4764 When run from a subdirectory of the project, it can be
4765 told to exclude changes outside the directory and show
4766 pathnames relative to it with this option. When you are
4767 not in a subdirectory (e.g. in a bare repository), you
4768 can name which subdirectory to make the output relative
4772 </p>
4773 </dd>
4775 -a
4776 </dt>
4778 --text
4779 </dt>
4780 <dd>
4781 <p>
4782 Treat all files as text.
4783 </p>
4784 </dd>
4786 --ignore-cr-at-eol
4787 </dt>
4788 <dd>
4789 <p>
4790 Ignore carriage-return at the end of line when doing a comparison.
4791 </p>
4792 </dd>
4794 --ignore-space-at-eol
4795 </dt>
4796 <dd>
4797 <p>
4798 Ignore changes in whitespace at EOL.
4799 </p>
4800 </dd>
4802 -b
4803 </dt>
4805 --ignore-space-change
4806 </dt>
4807 <dd>
4808 <p>
4809 Ignore changes in amount of whitespace. This ignores whitespace
4810 at line end, and considers all other sequences of one or
4811 more whitespace characters to be equivalent.
4812 </p>
4813 </dd>
4815 -w
4816 </dt>
4818 --ignore-all-space
4819 </dt>
4820 <dd>
4821 <p>
4822 Ignore whitespace when comparing lines. This ignores
4823 differences even if one line has whitespace where the other
4824 line has none.
4825 </p>
4826 </dd>
4828 --ignore-blank-lines
4829 </dt>
4830 <dd>
4831 <p>
4832 Ignore changes whose lines are all blank.
4833 </p>
4834 </dd>
4837 </dt>
4840 </dt>
4841 <dd>
4842 <p>
4844 be specified more than once.
4845 </p>
4846 </dd>
4849 </dt>
4850 <dd>
4851 <p>
4852 Show the context between diff hunks, up to the specified number
4853 of lines, thereby fusing hunks that are close to each other.
4855 is unset.
4856 </p>
4857 </dd>
4859 -W
4860 </dt>
4862 --function-context
4863 </dt>
4864 <dd>
4865 <p>
4866 Show whole function as context lines for each change.
4867 The function names are determined in the same way as
4870 </p>
4871 </dd>
4873 --ext-diff
4874 </dt>
4875 <dd>
4876 <p>
4877 Allow an external diff helper to be executed. If you set an
4880 </p>
4881 </dd>
4883 --no-ext-diff
4884 </dt>
4885 <dd>
4886 <p>
4887 Disallow external diff drivers.
4888 </p>
4889 </dd>
4891 --textconv
4892 </dt>
4894 --no-textconv
4895 </dt>
4896 <dd>
4897 <p>
4898 Allow (or disallow) external text conversion filters to be run
4900 details. Because textconv filters are typically a one-way
4901 conversion, the resulting diff is suitable for human
4902 consumption, but cannot be applied. For this reason, textconv
4904 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
4905 diff plumbing commands.
4906 </p>
4907 </dd>
4910 </dt>
4911 <dd>
4912 <p>
4915 Using "none" will consider the submodule modified when it either contains
4916 untracked or modified files or its HEAD differs from the commit recorded
4917 in the superproject and can be used to override any settings of the
4918 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
4919 "untracked" is used submodules are not considered dirty when they only
4920 contain untracked content (but they are still scanned for modified
4921 content). Using "dirty" ignores all changes to the work tree of submodules,
4922 only changes to the commits stored in the superproject are shown (this was
4924 </p>
4925 </dd>
4928 </dt>
4929 <dd>
4930 <p>
4931 Show the given source prefix instead of "a/".
4932 </p>
4933 </dd>
4936 </dt>
4937 <dd>
4938 <p>
4939 Show the given destination prefix instead of "b/".
4940 </p>
4941 </dd>
4943 --no-prefix
4944 </dt>
4945 <dd>
4946 <p>
4947 Do not show any source or destination prefix.
4948 </p>
4949 </dd>
4951 --default-prefix
4952 </dt>
4953 <dd>
4954 <p>
4956 This is usually the default already, but may be used to override
4958 </p>
4959 </dd>
4962 </dt>
4963 <dd>
4964 <p>
4965 Prepend an additional prefix to every line of output.
4966 </p>
4967 </dd>
4969 --ita-invisible-in-index
4970 </dt>
4971 <dd>
4972 <p>
4973 By default entries added by "git add -N" appear as an existing
4975 This option makes the entry appear as a new file in "git diff"
4976 and non-existent in "git diff --cached". This option could be
4978 experimental and could be removed in future.
4979 </p>
4980 </dd>
4981 </dl></div>
4984 </div>
4985 </div>
4997 You can customize the creation of patch text via the
4999 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
5000 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
5001 diff format:</p></div>
5003 <li>
5004 <p>
5005 It is preceded by a "git diff" header that looks like this:
5006 </p>
5010 </div></div>
5011 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
5012 involved. Especially, even for a creation or a deletion,
5013 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
5014 <div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
5015 name of the source file of the rename/copy and the name of
5016 the file that the rename/copy produces, respectively.</p></div>
5017 </li>
5018 <li>
5019 <p>
5020 It is followed by one or more extended header lines:
5021 </p>
5035 </div></div>
5036 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
5037 and file permission bits.</p></div>
5038 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
5040 the dissimilarity index is the percentage of changed lines. It
5041 is a rounded down integer, followed by a percent sign. The
5042 similarity index value of 100% is thus reserved for two equal
5043 files, while 100% dissimilarity means that no line from the old
5044 file made it into the new one.</p></div>
5045 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
5047 separate lines indicate the old and the new mode.</p></div>
5048 </li>
5049 <li>
5050 <p>
5051 Pathnames with "unusual" characters are quoted as explained for
5054 </p>
5055 </li>
5056 <li>
5057 <p>
5060 It is incorrect to apply each change to each file sequentially. For
5061 example, this patch will swap a and b:
5062 </p>
5065 <pre><code>diff --git a/a b/b
5066 rename from a
5067 rename to b
5068 diff --git a/b b/a
5069 rename from b
5070 rename to a</code></pre>
5071 </div></div>
5072 </li>
5073 <li>
5074 <p>
5075 Hunk headers mention the name of the function to which the hunk
5076 applies. See "Defining a custom hunk-header" in
5078 specific languages.
5079 </p>
5080 </li>
5081 </ol></div>
5082 </div>
5083 </div>
5087 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
5092 diffs in a specific format.</p></div>
5096 <pre><code>diff --combined describe.c
5097 index fabadb8,cc95eb0..4866510
5098 --- a/describe.c
5099 +++ b/describe.c
5102 }
5104 - static void describe(char *arg)
5105 -static void describe(struct commit *cmit, int last_one)
5106 ++static void describe(char *arg, int last_one)
5107 {
5108 + unsigned char sha1[20];
5109 + struct commit *cmit;
5110 struct commit_list *list;
5111 static int initialized = 0;
5112 struct commit_name *n;
5115 + usage(describe_usage);
5116 + cmit = lookup_commit_reference(sha1);
5117 + if (!cmit)
5118 + usage(describe_usage);
5119 +
5120 if (!initialized) {
5121 initialized = 1;
5122 for_each_ref(get_name);</code></pre>
5123 </div></div>
5125 <li>
5126 <p>
5127 It is preceded by a "git diff" header, that looks like
5129 </p>
5133 </div></div>
5138 </div></div>
5139 </li>
5140 <li>
5141 <p>
5142 It is followed by one or more extended header lines
5143 (this example shows a merge with two parents):
5144 </p>
5151 </div></div>
5152 <div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
5154 information about detected content movement (renames and
5155 copying detection) are designed to work with the diff of two
5157 </li>
5158 <li>
5159 <p>
5160 It is followed by a two-line from-file/to-file header:
5161 </p>
5164 <pre><code>--- a/file
5165 +++ b/file</code></pre>
5166 </div></div>
5167 <div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
5169 files.</p></div>
5170 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
5171 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
5172 where N is the number of parents in the merge commit:</p></div>
5175 <pre><code>--- a/file
5176 --- a/file
5177 --- a/file
5178 +++ b/file</code></pre>
5179 </div></div>
5181 active, to allow you to see the original name of the file in different
5182 parents.</p></div>
5183 </li>
5184 <li>
5185 <p>
5186 Chunk header format is modified to prevent people from
5188 was created for review of merge commit changes, and was not
5189 meant to be applied. The change is similar to the change in the
5191 </p>
5194 <pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
5195 </div></div>
5196 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
5197 header for combined diff format.</p></div>
5198 </li>
5199 </ol></div>
5201 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
5203 compares two or more files file1, file2,… with one file X, and
5204 shows how X differs from each of fileN. One column for each of
5205 fileN is prepended to the output line to note how X’s line is
5206 different from it.</p></div>
5207 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
5209 in the column N means that the line appears in the result,
5210 and fileN does not have that line (in other words, the line was
5211 added, from the point of view of that parent).</p></div>
5215 in either file1 or file2). Also, eight other lines are the same
5217 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
5218 merge commit with the merge result (i.e. file1..fileN are the
5220 two unresolved merge parents with the working tree file
5223 </div>
5224 </div>
5231 </dt>
5232 <dd>
5233 <p>
5234 Show the whole commit history, but skip any merges
5235 </p>
5236 </dd>
5239 </dt>
5240 <dd>
5241 <p>
5244 </p>
5245 </dd>
5248 </dt>
5249 <dd>
5250 <p>
5254 </p>
5255 </dd>
5258 </dt>
5259 <dd>
5260 <p>
5261 Show the commits that are in the "test" branch but not yet
5262 in the "release" branch, along with the list of paths
5263 each commit modifies.
5264 </p>
5265 </dd>
5268 </dt>
5269 <dd>
5270 <p>
5272 those commits that occurred before the file was given its
5273 present name.
5274 </p>
5275 </dd>
5278 </dt>
5279 <dd>
5280 <p>
5281 Shows all commits that are in any of local branches but not in
5283 origin doesn’t).
5284 </p>
5285 </dd>
5288 </dt>
5289 <dd>
5290 <p>
5291 Shows all commits that are in local master but not in any remote
5292 repository master branches.
5293 </p>
5294 </dd>
5297 </dt>
5298 <dd>
5299 <p>
5300 Shows the history including change diffs, but only from the
5302 branches, and showing full diffs of changes introduced by the merges.
5303 This makes sense only when following a strict policy of merging all
5304 topic branches when staying on a single integration branch.
5305 </p>
5306 </dd>
5309 </dt>
5310 <dd>
5311 <p>
5313 over time.
5314 </p>
5315 </dd>
5318 </dt>
5319 <dd>
5320 <p>
5321 Limits the number of commits to show to 3.
5322 </p>
5323 </dd>
5324 </dl></div>
5325 </div>
5326 </div>
5332 <li>
5333 <p>
5334 The contents of the blob objects are uninterpreted sequences
5335 of bytes. There is no encoding translation at the core
5336 level.
5337 </p>
5338 </li>
5339 <li>
5340 <p>
5341 Path names are encoded in UTF-8 normalization form C. This
5342 applies to tree objects, the index file, ref names, as well as
5343 path names in command line arguments, environment variables
5345 <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and
5347 </p>
5349 sequences of non-NUL bytes, there are no path name encoding
5350 conversions (except on Mac and Windows). Therefore, using
5351 non-ASCII path names will mostly work even on platforms and file
5352 systems that use legacy extended ASCII encodings. However,
5353 repositories created on such systems will not work properly on
5354 UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa.
5355 Additionally, many Git-based tools simply assume path names to
5357 </li>
5358 <li>
5359 <p>
5360 Commit log messages are typically encoded in UTF-8, but other
5361 extended ASCII encodings are also supported. This includes
5363 EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5,
5364 EUC-x, CP9xx etc.).
5365 </p>
5366 </li>
5367 </ul></div>
5369 in UTF-8, both the core and Git Porcelain are designed not to
5370 force UTF-8 on projects. If all participants of a particular
5371 project find it more convenient to use legacy encodings, Git
5372 does not forbid it. However, there are a few things to keep in
5373 mind.</p></div>
5375 <li>
5376 <p>
5378 a warning if the commit log message given to it does not look
5379 like a valid UTF-8 string, unless you explicitly say your
5380 project uses a legacy encoding. The way to say this is to
5382 </p>
5385 <pre><code>[i18n]
5387 </div></div>
5390 help other people who look at them later. Lack of this header
5392 </li>
5393 <li>
5394 <p>
5397 log message into UTF-8 unless otherwise specified. You can
5398 specify the desired output encoding with
5400 </p>
5403 <pre><code>[i18n]
5405 </div></div>
5408 </li>
5409 </ol></div>
5411 message when a commit is made to force UTF-8 at the commit
5412 object level, because re-coding to UTF-8 is not necessarily a
5413 reversible operation.</p></div>
5414 </div>
5415 </div>
5419 <div class="paragraph"><p>See <a href="git-config.html">git-config(1)</a> for core variables and <a href="git-diff.html">git-diff(1)</a>
5420 for settings related to diff generation.</p></div>
5423 format.pretty
5424 </dt>
5425 <dd>
5426 <p>
5429 </p>
5430 </dd>
5432 i18n.logOutputEncoding
5433 </dt>
5434 <dd>
5435 <p>
5438 otherwise.
5439 </p>
5440 </dd>
5441 </dl></div>
5442 <div class="paragraph"><p>Everything above this line in this section isn’t included from the
5447 log.abbrevCommit
5448 </dt>
5449 <dd>
5450 <p>
5451 If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
5452 <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--abbrev-commit</code>. You may
5454 </p>
5455 </dd>
5457 log.date
5458 </dt>
5459 <dd>
5460 <p>
5464 </p>
5467 be used.</p></div>
5468 </dd>
5470 log.decorate
5471 </dt>
5472 <dd>
5473 <p>
5474 Print out the ref names of any commits that are shown by the log
5477 specified, the full ref name (including prefix) will be printed.
5482 </p>
5483 </dd>
5485 log.initialDecorationSet
5486 </dt>
5487 <dd>
5488 <p>
5491 decorations.
5492 </p>
5493 </dd>
5495 log.excludeDecoration
5496 </dt>
5497 <dd>
5498 <p>
5499 Exclude the specified patterns from the log decorations. This is
5502 option.
5503 </p>
5504 </dd>
5506 log.diffMerges
5507 </dt>
5508 <dd>
5509 <p>
5513 </p>
5514 </dd>
5516 log.follow
5517 </dt>
5518 <dd>
5519 <p>
5520 If <code>true</code>, <code>git log</code> will act as if the <code>--follow</code> option was used when
5522 i.e. it cannot be used to follow multiple files and does not work well
5523 on non-linear history.
5524 </p>
5525 </dd>
5527 log.graphColors
5528 </dt>
5529 <dd>
5530 <p>
5531 A list of colors, separated by commas, that can be used to draw
5533 </p>
5534 </dd>
5536 log.showRoot
5537 </dt>
5538 <dd>
5539 <p>
5540 If true, the initial commit will be shown as a big creation event.
5541 This is equivalent to a diff against an empty tree.
5542 Tools like <a href="git-log.html">git-log(1)</a> or <a href="git-whatchanged.html">git-whatchanged(1)</a>, which
5543 normally hide the root commit will now show it. True by default.
5544 </p>
5545 </dd>
5547 log.showSignature
5548 </dt>
5549 <dd>
5550 <p>
5551 If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
5553 </p>
5554 </dd>
5556 log.mailmap
5557 </dt>
5558 <dd>
5559 <p>
5560 If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
5561 <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>, otherwise
5563 </p>
5564 </dd>
5566 notes.mergeStrategy
5567 </dt>
5568 <dd>
5569 <p>
5570 Which merge strategy to choose by default when resolving notes
5571 conflicts. Must be one of <code>manual</code>, <code>ours</code>, <code>theirs</code>, <code>union</code>, or
5574 </p>
5575 <div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option to
5577 </dd>
5580 </dt>
5581 <dd>
5582 <p>
5583 Which merge strategy to choose when doing a notes merge into
5587 </p>
5588 </dd>
5590 notes.displayRef
5591 </dt>
5592 <dd>
5593 <p>
5594 Which ref (or refs, if a glob or specified more than once), in
5598 </p>
5599 <div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_DISPLAY_REF</code>
5600 environment variable, which must be a colon separated list of refs or
5601 globs.</p></div>
5603 but a glob that does not match any refs is silently ignored.</p></div>
5604 <div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option to the <em>git
5606 those commands.</p></div>
5608 GIT_NOTES_REF) is also implicitly added to the list of refs to be
5609 displayed.</p></div>
5610 </dd>
5613 </dt>
5614 <dd>
5615 <p>
5618 notes from the original to the rewritten commit. Defaults to
5620 </p>
5621 <div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_REF</code>
5622 environment variable, which must be a colon separated list of refs or
5623 globs.</p></div>
5624 </dd>
5626 notes.rewriteMode
5627 </dt>
5628 <dd>
5629 <p>
5630 When copying notes during a rewrite (see the
5631 "notes.rewrite.<command>" option), determines what to do if
5632 the target commit already has a note. Must be one of
5633 <code>overwrite</code>, <code>concatenate</code>, <code>cat_sort_uniq</code>, or <code>ignore</code>.
5635 </p>
5636 <div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_MODE</code>
5637 environment variable.</p></div>
5638 </dd>
5640 notes.rewriteRef
5641 </dt>
5642 <dd>
5643 <p>
5644 When copying notes during a rewrite, specifies the (fully
5645 qualified) ref whose notes should be copied. May be a glob,
5646 in which case notes in all matching refs will be copied. You
5647 may also specify this configuration several times.
5648 </p>
5651 rewriting for the default commit notes.</p></div>
5652 <div class="paragraph"><p>Can be overridden with the <code>GIT_NOTES_REWRITE_REF</code> environment variable.
5653 See <code>notes.rewrite.<command></code> above for a further description of its format.</p></div>
5654 </dd>
5655 </dl></div>
5656 </div>
5657 </div>
5662 </div>
5663 </div>
5664 </div>
5668 Last updated
5670 </div>
5671 </div>
5672 </body>
5673 </html>