Google Git
Sign in
chromium / external / gitster / git-htmldocs / 55d9191be6ed28e5e9fa4c00b8958095400cd29c / . / git-log.html
blob: 05edde9e0b0eab8bb7b2cee56adf66ed4b1684a7 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]5<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]6<meta name="generator" content="AsciiDoc 8.6.9" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]7<title>git-log(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]8<style type="text/css">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]9/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10
11/* Default font. */
12body {
13 font-family: Georgia,serif;
14}
15
16/* Title font. */
17h1, h2, h3, h4, h5, h6,
18div.title, caption.title,
19thead, p.table.header,
20#toctitle,
21#author, #revnumber, #revdate, #revremark,
22#footer {
23 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]24}
25
26body {
27 margin: 1em 5% 1em 5%;
28}
29
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]30a {
31 color: blue;
32 text-decoration: underline;
33}
34a:visited {
35 color: fuchsia;
36}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]37
38em {
39 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]40 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]41}
42
43strong {
44 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]45 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]46}
47
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]50 margin-top: 1.2em;
51 margin-bottom: 0.5em;
52 line-height: 1.3;
53}
54
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]55h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]56 border-bottom: 2px solid silver;
57}
58h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59 padding-top: 0.5em;
60}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]61h3 {
62 float: left;
63}
64h3 + * {
65 clear: left;
66}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]67h5 {
68 font-size: 1.0em;
69}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]70
71div.sectionbody {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]72 margin-left: 0;
73}
74
75hr {
76 border: 1px solid silver;
77}
78
79p {
80 margin-top: 0.5em;
81 margin-bottom: 0.5em;
82}
83
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]84ul, ol, li > p {
85 margin-top: 0;
86}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]87ul > li { color: #aaa; }
88ul > li > * { color: black; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]89
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]90.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]94 padding: 0;
95 margin: 0;
96}
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]97pre {
98 white-space: pre-wrap;
99}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]100
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]101#author {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]102 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]103 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]104 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]105}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]106#email {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]107}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]108#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]109}
110
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]111#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]112 font-size: small;
113 border-top: 2px solid silver;
114 padding-top: 0.5em;
115 margin-top: 4.0em;
116}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]117#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]118 float: left;
119 padding-bottom: 0.5em;
120}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]121#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]122 float: right;
123 padding-bottom: 0.5em;
124}
125
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]126#preamble {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]127 margin-top: 1.5em;
128 margin-bottom: 1.5em;
129}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]130div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]131div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
132div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]133 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]134 margin-bottom: 1.5em;
135}
136div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]137 margin-top: 2.0em;
138 margin-bottom: 2.0em;
139 margin-right: 10%;
140 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]141}
142
143div.content { /* Block element content. */
144 padding: 0;
145}
146
147/* Block element titles. */
148div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]149 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]150 font-weight: bold;
151 text-align: left;
152 margin-top: 1.0em;
153 margin-bottom: 0.5em;
154}
155div.title + * {
156 margin-top: 0;
157}
158
159td div.title:first-child {
160 margin-top: 0.0em;
161}
162div.content div.title:first-child {
163 margin-top: 0.0em;
164}
165div.content + div.title {
166 margin-top: 0.0em;
167}
168
169div.sidebarblock > div.content {
170 background: #ffffee;
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]171 border: 1px solid #dddddd;
172 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]173 padding: 0.5em;
174}
175
176div.listingblock > div.content {
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]177 border: 1px solid #dddddd;
178 border-left: 5px solid #f0f0f0;
179 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 padding: 0.5em;
181}
182
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]183div.quoteblock, div.verseblock {
184 padding-left: 1.0em;
185 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]186 margin-right: 10%;
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]187 border-left: 5px solid #f0f0f0;
188 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]189}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]190
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]191div.quoteblock > div.attribution {
192 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]193 text-align: right;
194}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]195
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]196div.verseblock > pre.content {
197 font-family: inherit;
198 font-size: inherit;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]199}
200div.verseblock > div.attribution {
201 padding-top: 0.75em;
202 text-align: left;
203}
204/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]205div.verseblock + div.attribution {
206 text-align: left;
207}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]208
209div.admonitionblock .icon {
210 vertical-align: top;
211 font-size: 1.1em;
212 font-weight: bold;
213 text-decoration: underline;
214 color: #527bbd;
215 padding-right: 0.5em;
216}
217div.admonitionblock td.content {
218 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]219 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221
222div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]223 border-left: 3px solid #dddddd;
224 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]225}
226
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]227div.imageblock div.content { padding-left: 0; }
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]228span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]229a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]230
231dl {
232 margin-top: 0.8em;
233 margin-bottom: 0.8em;
234}
235dt {
236 margin-top: 0.5em;
237 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]238 font-style: normal;
239 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]240}
241dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]242 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]243}
244
245ul, ol {
246 list-style-position: outside;
247}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]248ol.arabic {
249 list-style-type: decimal;
250}
251ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]252 list-style-type: lower-alpha;
253}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]254ol.upperalpha {
255 list-style-type: upper-alpha;
256}
257ol.lowerroman {
258 list-style-type: lower-roman;
259}
260ol.upperroman {
261 list-style-type: upper-roman;
262}
263
264div.compact ul, div.compact ol,
265div.compact p, div.compact p,
266div.compact div, div.compact div {
267 margin-top: 0.1em;
268 margin-bottom: 0.1em;
269}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]270
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]271tfoot {
272 font-weight: bold;
273}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]274td > div.verse {
275 white-space: pre;
276}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]277
278div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]279 margin-top: 0.8em;
280 margin-bottom: 0.8em;
281}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]282div.hdlist tr {
283 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]284}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]285dt.hdlist1.strong, td.hdlist1.strong {
286 font-weight: bold;
287}
288td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]289 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]290 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]291 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]292 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]293}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]294td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]295 vertical-align: top;
296}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]297div.hdlist.compact tr {
298 margin: 0;
299 padding-bottom: 0;
300}
301
302.comment {
303 background: yellow;
304}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]305
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]306.footnote, .footnoteref {
307 font-size: 0.8em;
308}
309
310span.footnote, span.footnoteref {
311 vertical-align: super;
312}
313
314#footnotes {
315 margin: 20px 0 20px 0;
316 padding: 7px 0 0 0;
317}
318
319#footnotes div.footnote {
320 margin: 0 0 5px 0;
321}
322
323#footnotes hr {
324 border: none;
325 border-top: 1px solid silver;
326 height: 1px;
327 text-align: left;
328 margin-left: 0;
329 width: 20%;
330 min-width: 100px;
331}
332
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]333div.colist td {
334 padding-right: 0.5em;
335 padding-bottom: 0.3em;
336 vertical-align: top;
337}
338div.colist td img {
339 margin-top: 0.3em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]340}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]341
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]342@media print {
343 #footer-badges { display: none; }
344}
345
346#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347 margin-bottom: 2.5em;
348}
349
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]350#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]352 font-size: 1.1em;
353 font-weight: bold;
354 margin-top: 1.0em;
355 margin-bottom: 0.1em;
356}
357
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]358div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]359 margin-top: 0;
360 margin-bottom: 0;
361}
362div.toclevel2 {
363 margin-left: 2em;
364 font-size: 0.9em;
365}
366div.toclevel3 {
367 margin-left: 4em;
368 font-size: 0.9em;
369}
370div.toclevel4 {
371 margin-left: 6em;
372 font-size: 0.9em;
373}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]374
375span.aqua { color: aqua; }
376span.black { color: black; }
377span.blue { color: blue; }
378span.fuchsia { color: fuchsia; }
379span.gray { color: gray; }
380span.green { color: green; }
381span.lime { color: lime; }
382span.maroon { color: maroon; }
383span.navy { color: navy; }
384span.olive { color: olive; }
385span.purple { color: purple; }
386span.red { color: red; }
387span.silver { color: silver; }
388span.teal { color: teal; }
389span.white { color: white; }
390span.yellow { color: yellow; }
391
392span.aqua-background { background: aqua; }
393span.black-background { background: black; }
394span.blue-background { background: blue; }
395span.fuchsia-background { background: fuchsia; }
396span.gray-background { background: gray; }
397span.green-background { background: green; }
398span.lime-background { background: lime; }
399span.maroon-background { background: maroon; }
400span.navy-background { background: navy; }
401span.olive-background { background: olive; }
402span.purple-background { background: purple; }
403span.red-background { background: red; }
404span.silver-background { background: silver; }
405span.teal-background { background: teal; }
406span.white-background { background: white; }
407span.yellow-background { background: yellow; }
408
409span.big { font-size: 2em; }
410span.small { font-size: 0.6em; }
411
412span.underline { text-decoration: underline; }
413span.overline { text-decoration: overline; }
414span.line-through { text-decoration: line-through; }
415
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]416div.unbreakable { page-break-inside: avoid; }
417
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]418
419/*
420 * xhtml11 specific
421 *
422 * */
423
424div.tableblock {
425 margin-top: 1.0em;
426 margin-bottom: 1.5em;
427}
428div.tableblock > table {
429 border: 3px solid #527bbd;
430}
431thead, p.table.header {
432 font-weight: bold;
433 color: #527bbd;
434}
435p.table {
436 margin-top: 0;
437}
438/* Because the table frame attribute is overriden by CSS in most browsers. */
439div.tableblock > table[frame="void"] {
440 border-style: none;
441}
442div.tableblock > table[frame="hsides"] {
443 border-left-style: none;
444 border-right-style: none;
445}
446div.tableblock > table[frame="vsides"] {
447 border-top-style: none;
448 border-bottom-style: none;
449}
450
451
452/*
453 * html5 specific
454 *
455 * */
456
457table.tableblock {
458 margin-top: 1.0em;
459 margin-bottom: 1.5em;
460}
461thead, p.tableblock.header {
462 font-weight: bold;
463 color: #527bbd;
464}
465p.tableblock {
466 margin-top: 0;
467}
468table.tableblock {
469 border-width: 3px;
470 border-spacing: 0px;
471 border-style: solid;
472 border-color: #527bbd;
473 border-collapse: collapse;
474}
475th.tableblock, td.tableblock {
476 border-width: 1px;
477 padding: 4px;
478 border-style: solid;
479 border-color: #527bbd;
480}
481
482table.tableblock.frame-topbot {
483 border-left-style: hidden;
484 border-right-style: hidden;
485}
486table.tableblock.frame-sides {
487 border-top-style: hidden;
488 border-bottom-style: hidden;
489}
490table.tableblock.frame-none {
491 border-style: hidden;
492}
493
494th.tableblock.halign-left, td.tableblock.halign-left {
495 text-align: left;
496}
497th.tableblock.halign-center, td.tableblock.halign-center {
498 text-align: center;
499}
500th.tableblock.halign-right, td.tableblock.halign-right {
501 text-align: right;
502}
503
504th.tableblock.valign-top, td.tableblock.valign-top {
505 vertical-align: top;
506}
507th.tableblock.valign-middle, td.tableblock.valign-middle {
508 vertical-align: middle;
509}
510th.tableblock.valign-bottom, td.tableblock.valign-bottom {
511 vertical-align: bottom;
512}
513
514
515/*
516 * manpage specific
517 *
518 * */
519
520body.manpage h1 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]521 padding-top: 0.5em;
522 padding-bottom: 0.5em;
523 border-top: 2px solid silver;
524 border-bottom: 2px solid silver;
525}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]526body.manpage h2 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]527 border-style: none;
528}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]529body.manpage div.sectionbody {
530 margin-left: 3em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]531}
532
533@media print {
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]534 body.manpage div#toc { display: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]535}
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]536
537
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]538</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]539<script type="text/javascript">
540/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]541var asciidoc = { // Namespace.
542
543/////////////////////////////////////////////////////////////////////
544// Table Of Contents generator
545/////////////////////////////////////////////////////////////////////
546
547/* Author: Mihai Bazon, September 2002
548 * http://students.infoiasi.ro/~mishoo
549 *
550 * Table Of Content generator
551 * Version: 0.4
552 *
553 * Feel free to use this script under the terms of the GNU General Public
554 * License, as long as you do not remove or alter this notice.
555 */
556
557 /* modified by Troy D. Hanson, September 2006. License: GPL */
558 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
559
560// toclevels = 1..4.
561toc: function (toclevels) {
562
563 function getText(el) {
564 var text = "";
565 for (var i = el.firstChild; i != null; i = i.nextSibling) {
566 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
567 text += i.data;
568 else if (i.firstChild != null)
569 text += getText(i);
570 }
571 return text;
572 }
573
574 function TocEntry(el, text, toclevel) {
575 this.element = el;
576 this.text = text;
577 this.toclevel = toclevel;
578 }
579
580 function tocEntries(el, toclevels) {
581 var result = new Array;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]582 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]583 // Function that scans the DOM tree for header elements (the DOM2
584 // nodeIterator API would be a better technique but not supported by all
585 // browsers).
586 var iterate = function (el) {
587 for (var i = el.firstChild; i != null; i = i.nextSibling) {
588 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
589 var mo = re.exec(i.tagName);
590 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
591 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
592 }
593 iterate(i);
594 }
595 }
596 }
597 iterate(el);
598 return result;
599 }
600
601 var toc = document.getElementById("toc");
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]602 if (!toc) {
603 return;
604 }
605
606 // Delete existing TOC entries in case we're reloading the TOC.
607 var tocEntriesToRemove = [];
608 var i;
609 for (i = 0; i < toc.childNodes.length; i++) {
610 var entry = toc.childNodes[i];
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]611 if (entry.nodeName.toLowerCase() == 'div'
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]612 && entry.getAttribute("class")
613 && entry.getAttribute("class").match(/^toclevel/))
614 tocEntriesToRemove.push(entry);
615 }
616 for (i = 0; i < tocEntriesToRemove.length; i++) {
617 toc.removeChild(tocEntriesToRemove[i]);
618 }
619
620 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]621 var entries = tocEntries(document.getElementById("content"), toclevels);
622 for (var i = 0; i < entries.length; ++i) {
623 var entry = entries[i];
624 if (entry.element.id == "")
625 entry.element.id = "_toc_" + i;
626 var a = document.createElement("a");
627 a.href = "#" + entry.element.id;
628 a.appendChild(document.createTextNode(entry.text));
629 var div = document.createElement("div");
630 div.appendChild(a);
631 div.className = "toclevel" + entry.toclevel;
632 toc.appendChild(div);
633 }
634 if (entries.length == 0)
635 toc.parentNode.removeChild(toc);
636},
637
638
639/////////////////////////////////////////////////////////////////////
640// Footnotes generator
641/////////////////////////////////////////////////////////////////////
642
643/* Based on footnote generation code from:
644 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
645 */
646
647footnotes: function () {
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]648 // Delete existing footnote entries in case we're reloading the footnodes.
649 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]650 var noteholder = document.getElementById("footnotes");
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]651 if (!noteholder) {
652 return;
653 }
654 var entriesToRemove = [];
655 for (i = 0; i < noteholder.childNodes.length; i++) {
656 var entry = noteholder.childNodes[i];
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]657 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]658 entriesToRemove.push(entry);
659 }
660 for (i = 0; i < entriesToRemove.length; i++) {
661 noteholder.removeChild(entriesToRemove[i]);
662 }
663
664 // Rebuild footnote entries.
665 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]666 var spans = cont.getElementsByTagName("span");
667 var refs = {};
668 var n = 0;
669 for (i=0; i<spans.length; i++) {
670 if (spans[i].className == "footnote") {
671 n++;
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]672 var note = spans[i].getAttribute("data-note");
673 if (!note) {
674 // Use [\s\S] in place of . so multi-line matches work.
675 // Because JavaScript has no s (dotall) regex flag.
676 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
677 spans[i].innerHTML =
678 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
679 "' title='View footnote' class='footnote'>" + n + "</a>]";
680 spans[i].setAttribute("data-note", note);
681 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]682 noteholder.innerHTML +=
683 "<div class='footnote' id='_footnote_" + n + "'>" +
684 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
685 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]686 var id =spans[i].getAttribute("id");
687 if (id != null) refs["#"+id] = n;
688 }
689 }
690 if (n == 0)
691 noteholder.parentNode.removeChild(noteholder);
692 else {
693 // Process footnoterefs.
694 for (i=0; i<spans.length; i++) {
695 if (spans[i].className == "footnoteref") {
696 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
697 href = href.match(/#.*/)[0]; // Because IE return full URL.
698 n = refs[href];
699 spans[i].innerHTML =
700 "[<a href='#_footnote_" + n +
701 "' title='View footnote' class='footnote'>" + n + "</a>]";
702 }
703 }
704 }
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]705},
706
707install: function(toclevels) {
708 var timerId;
709
710 function reinstall() {
711 asciidoc.footnotes();
712 if (toclevels) {
713 asciidoc.toc(toclevels);
714 }
715 }
716
717 function reinstallAndRemoveTimer() {
718 clearInterval(timerId);
719 reinstall();
720 }
721
722 timerId = setInterval(reinstall, 500);
723 if (document.addEventListener)
724 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
725 else
726 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]727}
728
729}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]730asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]731/*]]>*/
732</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]733</head>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]734<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]735<div id="header">
736<h1>
737git-log(1) Manual Page
738</h1>
739<h2>NAME</h2>
740<div class="sectionbody">
741<p>git-log -
742 Show commit logs
743</p>
744</div>
745</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]746<div id="content">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]747<div class="sect1">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]748<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]749<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]750<div class="verseblock">
Junio C Hamanof26c77e2013-04-27 00:06:04[diff] [blame]751<pre class="content"><em>git log</em> [&lt;options&gt;] [&lt;revision range&gt;] [[--] &lt;path&gt;&#8230;]</pre>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]752<div class="attribution">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]753</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]754</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]755</div>
756<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]757<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]758<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]759<div class="paragraph"><p>Shows the commit logs.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]760<div class="paragraph"><p>The command takes options applicable to the <code>git rev-list</code>
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]761command to control what is shown and how, and options applicable to
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]762the <code>git diff-*</code> commands to control how the changes
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]763each commit introduces are shown.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]764</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]765</div>
766<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]767<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]768<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]769<div class="dlist"><dl>
770<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]771--follow
772</dt>
773<dd>
774<p>
775 Continue listing the history of a file beyond renames
776 (works only for a single file).
777</p>
778</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]779<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]780--no-decorate
781</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]782<dt class="hdlist1">
Junio C Hamano37cf4082016-05-30 01:22:14[diff] [blame]783--decorate[=short|full|auto|no]
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]784</dt>
785<dd>
786<p>
787 Print out the ref names of any commits that are shown. If <em>short</em> is
788 specified, the ref name prefixes <em>refs/heads/</em>, <em>refs/tags/</em> and
789 <em>refs/remotes/</em> will not be printed. If <em>full</em> is specified, the
Junio C Hamano37cf4082016-05-30 01:22:14[diff] [blame]790 full ref name (including prefix) will be printed. If <em>auto</em> is
791 specified, then if the output is going to a terminal, the ref names
792 are shown as if <em>short</em> were given, otherwise no ref names are
793 shown. The default option is <em>short</em>.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]794</p>
795</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]796<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]797--source
798</dt>
799<dd>
800<p>
801 Print out the ref name given on the command line by which each
802 commit was reached.
803</p>
804</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]805<dt class="hdlist1">
Junio C Hamanoce836cc2013-01-21 02:01:53[diff] [blame]806--use-mailmap
807</dt>
808<dd>
809<p>
810 Use mailmap file to map author and committer names and email
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]811 addresses to canonical real names and email addresses. See
Junio C Hamanoce836cc2013-01-21 02:01:53[diff] [blame]812 <a href="git-shortlog.html">git-shortlog(1)</a>.
813</p>
814</dd>
815<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]816--full-diff
817</dt>
818<dd>
819<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]820 Without this flag, <code>git log -p &lt;path&gt;...</code> shows commits that
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]821 touch the specified paths, and diffs about the same specified
822 paths. With this, the full diff is shown for commits that touch
823 the specified paths; this means that "&lt;path&gt;&#8230;" limits only
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]824 commits, and doesn&#8217;t limit diff for those commits.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]825</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]826<div class="paragraph"><p>Note that this affects all diff-based output types, e.g. those
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]827produced by <code>--stat</code>, etc.</p></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]828</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]829<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]830--log-size
831</dt>
832<dd>
833<p>
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]834 Include a line &#8220;log size &lt;number&gt;&#8221; in the output for each commit,
835 where &lt;number&gt; is the length of that commit&#8217;s message in bytes.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]836 Intended to speed up tools that read log messages from <code>git log</code>
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]837 output by allowing them to allocate space in advance.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]838</p>
839</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]840<dt class="hdlist1">
Junio C Hamano8eac2682013-09-09 22:35:20[diff] [blame]841-L &lt;start&gt;,&lt;end&gt;:&lt;file&gt;
842</dt>
843<dt class="hdlist1">
Junio C Hamanodd5004a2015-05-06 19:33:32[diff] [blame]844-L :&lt;funcname&gt;:&lt;file&gt;
Junio C Hamano7e590a12013-06-02 23:46:52[diff] [blame]845</dt>
846<dd>
847<p>
848 Trace the evolution of the line range given by "&lt;start&gt;,&lt;end&gt;"
Junio C Hamanodd5004a2015-05-06 19:33:32[diff] [blame]849 (or the function name regex &lt;funcname&gt;) within the &lt;file&gt;. You may
Junio C Hamano7e590a12013-06-02 23:46:52[diff] [blame]850 not give any pathspec limiters. This is currently limited to
851 a walk starting from a single revision, i.e., you may only
852 give zero or one positive revision arguments.
853 You can specify this option more than once.
854</p>
855<div class="paragraph"><p>&lt;start&gt; and &lt;end&gt; can take one of these forms:</p></div>
856<div class="ulist"><ul>
857<li>
858<p>
859number
860</p>
861<div class="paragraph"><p>If &lt;start&gt; or &lt;end&gt; is a number, it specifies an
862absolute line number (lines count from 1).</p></div>
863</li>
864<li>
865<p>
866/regex/
867</p>
868<div class="paragraph"><p>This form will use the first line matching the given
Junio C Hamano8eac2682013-09-09 22:35:20[diff] [blame]869POSIX regex. If &lt;start&gt; is a regex, it will search from the end of
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]870the previous <code>-L</code> range, if any, otherwise from the start of file.
Junio C Hamano8eac2682013-09-09 22:35:20[diff] [blame]871If &lt;start&gt; is &#8220;^/regex/&#8221;, it will search from the start of file.
872If &lt;end&gt; is a regex, it will search
Junio C Hamano7e590a12013-06-02 23:46:52[diff] [blame]873starting at the line given by &lt;start&gt;.</p></div>
874</li>
875<li>
876<p>
877+offset or -offset
878</p>
879<div class="paragraph"><p>This is only valid for &lt;end&gt; and will specify a number
880of lines before or after the line given by &lt;start&gt;.</p></div>
881</li>
Junio C Hamano7e590a12013-06-02 23:46:52[diff] [blame]882</ul></div>
Junio C Hamanodd5004a2015-05-06 19:33:32[diff] [blame]883<div class="paragraph"><p>If &#8220;:&lt;funcname&gt;&#8221; is given in place of &lt;start&gt; and &lt;end&gt;, it is a
884regular expression that denotes the range from the first funcname line
885that matches &lt;funcname&gt;, up to the next funcname line. &#8220;:&lt;funcname&gt;&#8221;
886searches from the end of the previous <code>-L</code> range, if any, otherwise
887from the start of file. &#8220;^:&lt;funcname&gt;&#8221; searches from the start of
888file.</p></div>
Junio C Hamano7e590a12013-06-02 23:46:52[diff] [blame]889</dd>
890<dt class="hdlist1">
Junio C Hamanof26c77e2013-04-27 00:06:04[diff] [blame]891&lt;revision range&gt;
892</dt>
893<dd>
894<p>
895 Show only commits in the specified revision range. When no
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]896 &lt;revision range&gt; is specified, it defaults to <code>HEAD</code> (i.e. the
897 whole history leading to the current commit). <code>origin..HEAD</code>
Junio C Hamanof26c77e2013-04-27 00:06:04[diff] [blame]898 specifies all the commits reachable from the current commit
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]899 (i.e. <code>HEAD</code>), but not from <code>origin</code>. For a complete list of
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]900 ways to spell &lt;revision range&gt;, see the <em>Specifying Ranges</em>
Junio C Hamanof26c77e2013-04-27 00:06:04[diff] [blame]901 section of <a href="gitrevisions.html">gitrevisions(7)</a>.
902</p>
903</dd>
904<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]905[--] &lt;path&gt;&#8230;
906</dt>
907<dd>
908<p>
Junio C Hamano5723afa2011-08-31 00:49:23[diff] [blame]909 Show only commits that are enough to explain how the files
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]910 that match the specified paths came to be. See <em>History
911 Simplification</em> below for details and other simplification
Junio C Hamano5723afa2011-08-31 00:49:23[diff] [blame]912 modes.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]913</p>
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]914<div class="paragraph"><p>Paths may need to be prefixed with &#8216;`-- '&#8217; to separate them from
Junio C Hamanof26c77e2013-04-27 00:06:04[diff] [blame]915options or the revision range, when confusion arises.</p></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]916</dd>
917</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]918<div class="sect2">
919<h3 id="_commit_limiting">Commit Limiting</h3>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]920<div class="paragraph"><p>Besides specifying a range of commits that should be listed using the
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]921special notations explained in the description, additional commit
Junio C Hamano8ce35d72012-09-18 22:30:42[diff] [blame]922limiting may be applied.</p></div>
923<div class="paragraph"><p>Using more options generally further limits the output (e.g.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]924<code>--since=&lt;date1&gt;</code> limits to commits newer than <code>&lt;date1&gt;</code>, and using it
925with <code>--grep=&lt;pattern&gt;</code> further limits to commits whose log message
926has a line that matches <code>&lt;pattern&gt;</code>), unless otherwise noted.</p></div>
Junio C Hamano8ce35d72012-09-18 22:30:42[diff] [blame]927<div class="paragraph"><p>Note that these are applied before commit
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]928ordering and formatting options, such as <code>--reverse</code>.</p></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]929<div class="openblock">
930<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]931<div class="dlist"><dl>
932<dt class="hdlist1">
Junio C Hamano693e7092012-09-12 22:56:53[diff] [blame]933-&lt;number&gt;
934</dt>
935<dt class="hdlist1">
936-n &lt;number&gt;
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]937</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]938<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]939--max-count=&lt;number&gt;
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]940</dt>
941<dd>
942<p>
Junio C Hamanoc5be4cc2011-03-09 07:20:43[diff] [blame]943 Limit the number of commits to output.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]944</p>
945</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]946<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]947--skip=&lt;number&gt;
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]948</dt>
949<dd>
950<p>
951 Skip <em>number</em> commits before starting to show the commit output.
952</p>
953</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]954<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]955--since=&lt;date&gt;
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]956</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]957<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]958--after=&lt;date&gt;
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]959</dt>
960<dd>
961<p>
962 Show commits more recent than a specific date.
963</p>
964</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]965<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]966--until=&lt;date&gt;
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]967</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]968<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]969--before=&lt;date&gt;
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]970</dt>
971<dd>
972<p>
973 Show commits older than a specific date.
974</p>
975</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]976<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]977--author=&lt;pattern&gt;
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]978</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]979<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]980--committer=&lt;pattern&gt;
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]981</dt>
982<dd>
983<p>
984 Limit the commits output to ones with author/committer
Junio C Hamano8ce35d72012-09-18 22:30:42[diff] [blame]985 header lines that match the specified pattern (regular
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]986 expression). With more than one <code>--author=&lt;pattern&gt;</code>,
Junio C Hamano8ce35d72012-09-18 22:30:42[diff] [blame]987 commits whose author matches any of the given patterns are
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]988 chosen (similarly for multiple <code>--committer=&lt;pattern&gt;</code>).
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]989</p>
990</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]991<dt class="hdlist1">
Junio C Hamano9954ed72012-10-03 04:54:00[diff] [blame]992--grep-reflog=&lt;pattern&gt;
993</dt>
994<dd>
995<p>
996 Limit the commits output to ones with reflog entries that
997 match the specified pattern (regular expression). With
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]998 more than one <code>--grep-reflog</code>, commits whose reflog message
Junio C Hamano9954ed72012-10-03 04:54:00[diff] [blame]999 matches any of the given patterns are chosen. It is an
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1000 error to use this option unless <code>--walk-reflogs</code> is in use.
Junio C Hamano9954ed72012-10-03 04:54:00[diff] [blame]1001</p>
1002</dd>
1003<dt class="hdlist1">
Junio C Hamanob4a9ede2009-04-08 07:36:32[diff] [blame]1004--grep=&lt;pattern&gt;
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1005</dt>
1006<dd>
1007<p>
1008 Limit the commits output to ones with log message that
Junio C Hamano8ce35d72012-09-18 22:30:42[diff] [blame]1009 matches the specified pattern (regular expression). With
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1010 more than one <code>--grep=&lt;pattern&gt;</code>, commits whose message
Junio C Hamano8ce35d72012-09-18 22:30:42[diff] [blame]1011 matches any of the given patterns are chosen (but see
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1012 <code>--all-match</code>).
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1013</p>
Junio C Hamano8152abf2015-04-28 22:48:02[diff] [blame]1014<div class="paragraph"><p>When <code>--show-notes</code> is in effect, the message from the notes is
1015matched as if it were part of the log message.</p></div>
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1016</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1017<dt class="hdlist1">
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]1018--all-match
1019</dt>
1020<dd>
1021<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1022 Limit the commits output to ones that match all given <code>--grep</code>,
Junio C Hamano8ce35d72012-09-18 22:30:42[diff] [blame]1023 instead of ones that match at least one.
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]1024</p>
1025</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1026<dt class="hdlist1">
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]1027--invert-grep
1028</dt>
1029<dd>
1030<p>
1031 Limit the commits output to ones with log message that do not
1032 match the pattern specified with <code>--grep=&lt;pattern&gt;</code>.
1033</p>
1034</dd>
1035<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1036-i
1037</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1038<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1039--regexp-ignore-case
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1040</dt>
1041<dd>
1042<p>
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]1043 Match the regular expression limiting patterns without regard to letter
1044 case.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1045</p>
1046</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1047<dt class="hdlist1">
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]1048--basic-regexp
1049</dt>
1050<dd>
1051<p>
1052 Consider the limiting patterns to be basic regular expressions;
1053 this is the default.
1054</p>
1055</dd>
1056<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1057-E
1058</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1059<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1060--extended-regexp
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1061</dt>
1062<dd>
1063<p>
1064 Consider the limiting patterns to be extended regular expressions
1065 instead of the default basic regular expressions.
1066</p>
1067</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1068<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1069-F
1070</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1071<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1072--fixed-strings
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1073</dt>
1074<dd>
1075<p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1076 Consider the limiting patterns to be fixed strings (don&#8217;t interpret
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1077 pattern as a regular expression).
1078</p>
1079</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1080<dt class="hdlist1">
Junio C Hamanoa275c1f2017-06-19 20:10:12[diff] [blame]1081-P
1082</dt>
1083<dt class="hdlist1">
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]1084--perl-regexp
1085</dt>
1086<dd>
1087<p>
Junio C Hamano222ed822017-06-02 06:24:06[diff] [blame]1088 Consider the limiting patterns to be Perl-compatible regular
1089 expressions.
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]1090</p>
Junio C Hamano222ed822017-06-02 06:24:06[diff] [blame]1091<div class="paragraph"><p>Support for these types of regular expressions is an optional
1092compile-time dependency. If Git wasn&#8217;t compiled with support for them
1093providing this option will cause it to die.</p></div>
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]1094</dd>
1095<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1096--remove-empty
1097</dt>
1098<dd>
1099<p>
1100 Stop when a given path disappears from the tree.
1101</p>
1102</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1103<dt class="hdlist1">
Junio C Hamano934e1782009-07-16 06:59:15[diff] [blame]1104--merges
1105</dt>
1106<dd>
1107<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1108 Print only merge commits. This is exactly the same as <code>--min-parents=2</code>.
Junio C Hamano934e1782009-07-16 06:59:15[diff] [blame]1109</p>
1110</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1111<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1112--no-merges
1113</dt>
1114<dd>
1115<p>
Junio C Hamanof32ce262011-03-27 07:35:11[diff] [blame]1116 Do not print commits with more than one parent. This is
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1117 exactly the same as <code>--max-parents=1</code>.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1118</p>
1119</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1120<dt class="hdlist1">
Junio C Hamanof32ce262011-03-27 07:35:11[diff] [blame]1121--min-parents=&lt;number&gt;
1122</dt>
1123<dt class="hdlist1">
1124--max-parents=&lt;number&gt;
1125</dt>
1126<dt class="hdlist1">
1127--no-min-parents
1128</dt>
1129<dt class="hdlist1">
1130--no-max-parents
1131</dt>
1132<dd>
1133<p>
Junio C Hamanoc5bb3b32013-08-05 22:43:36[diff] [blame]1134 Show only commits which have at least (or at most) that many parent
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1135 commits. In particular, <code>--max-parents=1</code> is the same as <code>--no-merges</code>,
1136 <code>--min-parents=2</code> is the same as <code>--merges</code>. <code>--max-parents=0</code>
1137 gives all root commits and <code>--min-parents=3</code> all octopus merges.
Junio C Hamanof32ce262011-03-27 07:35:11[diff] [blame]1138</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1139<div class="paragraph"><p><code>--no-min-parents</code> and <code>--no-max-parents</code> reset these limits (to no limit)
1140again. Equivalent forms are <code>--min-parents=0</code> (any commit has 0 or more
1141parents) and <code>--max-parents=-1</code> (negative numbers denote no upper limit).</p></div>
Junio C Hamanof32ce262011-03-27 07:35:11[diff] [blame]1142</dd>
1143<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1144--first-parent
1145</dt>
1146<dd>
1147<p>
1148 Follow only the first parent commit upon seeing a merge
1149 commit. This option can give a better overview when
1150 viewing the evolution of a particular topic branch,
1151 because merges into a topic branch tend to be only about
1152 adjusting to updated upstream from time to time, and
1153 this option allows you to ignore the individual commits
Junio C Hamanoef57d1e2015-03-25 21:23:00[diff] [blame]1154 brought in to your history by such a merge. Cannot be
1155 combined with --bisect.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1156</p>
1157</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1158<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1159--not
1160</dt>
1161<dd>
1162<p>
1163 Reverses the meaning of the <em>&#94;</em> prefix (or lack thereof)
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1164 for all following revision specifiers, up to the next <code>--not</code>.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1165</p>
1166</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1167<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1168--all
1169</dt>
1170<dd>
1171<p>
Junio C Hamanoe89102f2017-02-15 23:18:15[diff] [blame]1172 Pretend as if all the refs in <code>refs/</code>, along with <code>HEAD</code>, are
1173 listed on the command line as <em>&lt;commit&gt;</em>.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1174</p>
1175</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1176<dt class="hdlist1">
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1177--branches[=&lt;pattern&gt;]
Junio C Hamano50819852008-11-19 02:07:56[diff] [blame]1178</dt>
1179<dd>
1180<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1181 Pretend as if all the refs in <code>refs/heads</code> are listed
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1182 on the command line as <em>&lt;commit&gt;</em>. If <em>&lt;pattern&gt;</em> is given, limit
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]1183 branches to ones matching given shell glob. If pattern lacks <em>?</em>,
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1184 <em>&#42;</em>, or <em>[</em>, <em>/&#42;</em> at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56[diff] [blame]1185</p>
1186</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1187<dt class="hdlist1">
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1188--tags[=&lt;pattern&gt;]
Junio C Hamano50819852008-11-19 02:07:56[diff] [blame]1189</dt>
1190<dd>
1191<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1192 Pretend as if all the refs in <code>refs/tags</code> are listed
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1193 on the command line as <em>&lt;commit&gt;</em>. If <em>&lt;pattern&gt;</em> is given, limit
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1194 tags to ones matching given shell glob. If pattern lacks <em>?</em>, <em>&#42;</em>,
1195 or <em>[</em>, <em>/&#42;</em> at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56[diff] [blame]1196</p>
1197</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1198<dt class="hdlist1">
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1199--remotes[=&lt;pattern&gt;]
Junio C Hamano50819852008-11-19 02:07:56[diff] [blame]1200</dt>
1201<dd>
1202<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1203 Pretend as if all the refs in <code>refs/remotes</code> are listed
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1204 on the command line as <em>&lt;commit&gt;</em>. If <em>&lt;pattern&gt;</em> is given, limit
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]1205 remote-tracking branches to ones matching given shell glob.
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1206 If pattern lacks <em>?</em>, <em>&#42;</em>, or <em>[</em>, <em>/&#42;</em> at the end is implied.
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]1207</p>
1208</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1209<dt class="hdlist1">
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1210--glob=&lt;glob-pattern&gt;
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]1211</dt>
1212<dd>
1213<p>
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1214 Pretend as if all the refs matching shell glob <em>&lt;glob-pattern&gt;</em>
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]1215 are listed on the command line as <em>&lt;commit&gt;</em>. Leading <em>refs/</em>,
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1216 is automatically prepended if missing. If pattern lacks <em>?</em>, <em>&#42;</em>,
1217 or <em>[</em>, <em>/&#42;</em> at the end is implied.
Junio C Hamano50819852008-11-19 02:07:56[diff] [blame]1218</p>
1219</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1220<dt class="hdlist1">
Junio C Hamanof079f702013-12-06 23:43:18[diff] [blame]1221--exclude=&lt;glob-pattern&gt;
1222</dt>
1223<dd>
1224<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1225 Do not include refs matching <em>&lt;glob-pattern&gt;</em> that the next <code>--all</code>,
1226 <code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or <code>--glob</code> would otherwise
Junio C Hamanof079f702013-12-06 23:43:18[diff] [blame]1227 consider. Repetitions of this option accumulate exclusion patterns
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1228 up to the next <code>--all</code>, <code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or
1229 <code>--glob</code> option (other options or arguments do not clear
Junio C Hamanofb5ffde2014-11-04 22:38:56[diff] [blame]1230 accumulated patterns).
Junio C Hamanof079f702013-12-06 23:43:18[diff] [blame]1231</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1232<div class="paragraph"><p>The patterns given should not begin with <code>refs/heads</code>, <code>refs/tags</code>, or
1233<code>refs/remotes</code> when applied to <code>--branches</code>, <code>--tags</code>, or <code>--remotes</code>,
1234respectively, and they must begin with <code>refs/</code> when applied to <code>--glob</code>
1235or <code>--all</code>. If a trailing <em>/&#42;</em> is intended, it must be given
Junio C Hamanof079f702013-12-06 23:43:18[diff] [blame]1236explicitly.</p></div>
1237</dd>
1238<dt class="hdlist1">
Junio C Hamano2a4bcbc2014-10-29 20:07:39[diff] [blame]1239--reflog
1240</dt>
1241<dd>
1242<p>
1243 Pretend as if all objects mentioned by reflogs are listed on the
1244 command line as <code>&lt;commit&gt;</code>.
1245</p>
1246</dd>
1247<dt class="hdlist1">
Junio C Hamano084228c2011-05-30 08:13:52[diff] [blame]1248--ignore-missing
1249</dt>
1250<dd>
1251<p>
1252 Upon seeing an invalid object name in the input, pretend as if
1253 the bad input was not given.
1254</p>
1255</dd>
1256<dt class="hdlist1">
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1257--bisect
1258</dt>
1259<dd>
1260<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1261 Pretend as if the bad bisection ref <code>refs/bisect/bad</code>
1262 was listed and as if it was followed by <code>--not</code> and the good
1263 bisection refs <code>refs/bisect/good-*</code> on the command
Junio C Hamanoef57d1e2015-03-25 21:23:00[diff] [blame]1264 line. Cannot be combined with --first-parent.
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1265</p>
1266</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1267<dt class="hdlist1">
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1268--stdin
1269</dt>
1270<dd>
1271<p>
1272 In addition to the <em>&lt;commit&gt;</em> listed on the command
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1273 line, read them from the standard input. If a <code>--</code> separator is
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1274 seen, stop reading commits and start reading paths to limit the
1275 result.
1276</p>
1277</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1278<dt class="hdlist1">
Junio C Hamano9a2fb2d2011-03-23 05:40:15[diff] [blame]1279--cherry-mark
1280</dt>
1281<dd>
1282<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1283 Like <code>--cherry-pick</code> (see below) but mark equivalent commits
1284 with <code>=</code> rather than omitting them, and inequivalent ones with <code>+</code>.
Junio C Hamano9a2fb2d2011-03-23 05:40:15[diff] [blame]1285</p>
1286</dd>
1287<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1288--cherry-pick
1289</dt>
1290<dd>
1291<p>
1292 Omit any commit that introduces the same change as
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]1293 another commit on the &#8220;other side&#8221; when the set of
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1294 commits are limited with symmetric difference.
1295</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1296<div class="paragraph"><p>For example, if you have two branches, <code>A</code> and <code>B</code>, a usual way
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1297to list all commits on only one side of them is with
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1298<code>--left-right</code> (see the example below in the description of
1299the <code>--left-right</code> option). However, it shows the commits that were
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]1300cherry-picked from the other branch (for example, &#8220;3rd on b&#8221; may be
1301cherry-picked from branch A). With this option, such pairs of commits are
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1302excluded from the output.</p></div>
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1303</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1304<dt class="hdlist1">
Junio C Hamano9a2fb2d2011-03-23 05:40:15[diff] [blame]1305--left-only
1306</dt>
1307<dt class="hdlist1">
1308--right-only
1309</dt>
1310<dd>
1311<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]1312 List only commits on the respective side of a symmetric difference,
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1313 i.e. only those which would be marked <code>&lt;</code> resp. <code>&gt;</code> by
1314 <code>--left-right</code>.
Junio C Hamano9a2fb2d2011-03-23 05:40:15[diff] [blame]1315</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1316<div class="paragraph"><p>For example, <code>--cherry-pick --right-only A...B</code> omits those
1317commits from <code>B</code> which are in <code>A</code> or are patch-equivalent to a commit in
1318<code>A</code>. In other words, this lists the <code>+</code> commits from <code>git cherry A B</code>.
1319More precisely, <code>--cherry-pick --right-only --no-merges</code> gives the exact
Junio C Hamano9a2fb2d2011-03-23 05:40:15[diff] [blame]1320list.</p></div>
1321</dd>
1322<dt class="hdlist1">
1323--cherry
1324</dt>
1325<dd>
1326<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1327 A synonym for <code>--right-only --cherry-mark --no-merges</code>; useful to
Junio C Hamano9a2fb2d2011-03-23 05:40:15[diff] [blame]1328 limit the output to the commits on our side and mark those that
1329 have been applied to the other side of a forked history with
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1330 <code>git log --cherry upstream...mybranch</code>, similar to
1331 <code>git cherry upstream mybranch</code>.
Junio C Hamano9a2fb2d2011-03-23 05:40:15[diff] [blame]1332</p>
1333</dd>
1334<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1335-g
1336</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1337<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1338--walk-reflogs
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1339</dt>
1340<dd>
1341<p>
1342 Instead of walking the commit ancestry chain, walk
1343 reflog entries from the most recent one to older ones.
1344 When this option is used you cannot specify commits to
1345 exclude (that is, <em>&#94;commit</em>, <em>commit1..commit2</em>,
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]1346 and <em>commit1...commit2</em> notations cannot be used).
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1347</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1348<div class="paragraph"><p>With <code>--pretty</code> format other than <code>oneline</code> (for obvious reasons),
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1349this causes the output to have two extra lines of information
Junio C Hamanoe548d1b2016-08-08 22:26:49[diff] [blame]1350taken from the reflog. The reflog designator in the output may be shown
1351as <code>ref@{Nth}</code> (where <code>Nth</code> is the reverse-chronological index in the
1352reflog) or as <code>ref@{timestamp}</code> (with the timestamp for that entry),
1353depending on a few rules:</p></div>
1354<div class="openblock">
1355<div class="content">
1356<div class="olist arabic"><ol class="arabic">
1357<li>
1358<p>
1359If the starting point is specified as <code>ref@{Nth}</code>, show the index
1360format.
1361</p>
1362</li>
1363<li>
1364<p>
1365If the starting point was specified as <code>ref@{now}</code>, show the
1366timestamp format.
1367</p>
1368</li>
1369<li>
1370<p>
1371If neither was used, but <code>--date</code> was given on the command line, show
1372the timestamp in the format requested by <code>--date</code>.
1373</p>
1374</li>
1375<li>
1376<p>
1377Otherwise, show the index format.
1378</p>
1379</li>
1380</ol></div>
1381</div></div>
1382<div class="paragraph"><p>Under <code>--pretty=oneline</code>, the commit message is
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1383prefixed with this information on the same line.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1384This option cannot be combined with <code>--reverse</code>.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1385See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div>
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1386</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1387<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1388--merge
1389</dt>
1390<dd>
1391<p>
1392 After a failed merge, show refs that touch files having a
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1393 conflict and don&#8217;t exist on all heads to merge.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1394</p>
1395</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1396<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1397--boundary
1398</dt>
1399<dd>
1400<p>
Junio C Hamano27159f82013-06-14 17:19:22[diff] [blame]1401 Output excluded boundary commits. Boundary commits are
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1402 prefixed with <code>-</code>.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1403</p>
1404</dd>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1405</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1406</div></div>
1407</div>
1408<div class="sect2">
1409<h3 id="_history_simplification">History Simplification</h3>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1410<div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1411commits modifying a particular &lt;path&gt;. But there are two parts of
1412<em>History Simplification</em>, one part is selecting the commits and the other
1413is how to do it, as there are various strategies to simplify the history.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1414<div class="paragraph"><p>The following options select the commits to be shown:</p></div>
1415<div class="dlist"><dl>
1416<dt class="hdlist1">
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1417&lt;paths&gt;
1418</dt>
1419<dd>
1420<p>
1421 Commits modifying the given &lt;paths&gt; are selected.
1422</p>
1423</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1424<dt class="hdlist1">
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1425--simplify-by-decoration
1426</dt>
1427<dd>
1428<p>
1429 Commits that are referred by some branch or tag are selected.
1430</p>
1431</dd>
1432</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1433<div class="paragraph"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
1434<div class="paragraph"><p>The following options affect the way the simplification is performed:</p></div>
1435<div class="dlist"><dl>
1436<dt class="hdlist1">
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1437Default mode
1438</dt>
1439<dd>
1440<p>
1441 Simplifies the history to the simplest history explaining the
1442 final state of the tree. Simplest because it prunes some side
1443 branches if the end result is the same (i.e. merging branches
1444 with the same content)
1445</p>
1446</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1447<dt class="hdlist1">
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1448--full-history
1449</dt>
1450<dd>
1451<p>
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]1452 Same as the default mode, but does not prune some history.
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1453</p>
1454</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1455<dt class="hdlist1">
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1456--dense
1457</dt>
1458<dd>
1459<p>
1460 Only the selected commits are shown, plus some to have a
1461 meaningful history.
1462</p>
1463</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1464<dt class="hdlist1">
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1465--sparse
1466</dt>
1467<dd>
1468<p>
1469 All commits in the simplified history are shown.
1470</p>
1471</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1472<dt class="hdlist1">
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1473--simplify-merges
1474</dt>
1475<dd>
1476<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1477 Additional option to <code>--full-history</code> to remove some needless
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1478 merges from the resulting history, as there are no selected
1479 commits contributing to this merge.
1480</p>
1481</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1482<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1483--ancestry-path
1484</dt>
1485<dd>
1486<p>
1487 When given a range of commits to display (e.g. <em>commit1..commit2</em>
1488 or <em>commit2 &#94;commit1</em>), only display commits that exist
1489 directly on the ancestry chain between the <em>commit1</em> and
1490 <em>commit2</em>, i.e. commits that are both descendants of <em>commit1</em>,
1491 and ancestors of <em>commit2</em>.
1492</p>
1493</dd>
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1494</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1495<div class="paragraph"><p>A more detailed explanation follows.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1496<div class="paragraph"><p>Suppose you specified <code>foo</code> as the &lt;paths&gt;. We shall call commits
1497that modify <code>foo</code> !TREESAME, and the rest TREESAME. (In a diff
1498filtered for <code>foo</code>, they look different and equal, respectively.)</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1499<div class="paragraph"><p>In the following, we will always refer to the same example history to
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1500illustrate the differences between simplification settings. We assume
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1501that you are filtering for a file <code>foo</code> in this commit graph:</p></div>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1502<div class="listingblock">
1503<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1504<pre><code> .-A---M---N---O---P---Q
Junio C Hamano27159f82013-06-14 17:19:22[diff] [blame]1505 / / / / / /
1506 I B C D E Y
1507 \ / / / / /
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1508 `-------------' X</code></pre>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1509</div></div>
Junio C Hamano27159f82013-06-14 17:19:22[diff] [blame]1510<div class="paragraph"><p>The horizontal line of history A---Q is taken to be the first parent of
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1511each merge. The commits are:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1512<div class="ulist"><ul>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1513<li>
1514<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1515<code>I</code> is the initial commit, in which <code>foo</code> exists with contents
1516 &#8220;asdf&#8221;, and a file <code>quux</code> exists with contents &#8220;quux&#8221;. Initial
1517 commits are compared to an empty tree, so <code>I</code> is !TREESAME.
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1518</p>
1519</li>
1520<li>
1521<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1522In <code>A</code>, <code>foo</code> contains just &#8220;foo&#8221;.
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1523</p>
1524</li>
1525<li>
1526<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1527<code>B</code> contains the same change as <code>A</code>. Its merge <code>M</code> is trivial and
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1528 hence TREESAME to all parents.
1529</p>
1530</li>
1531<li>
1532<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1533<code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to &#8220;foobar&#8221;,
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1534 so it is not TREESAME to any parent.
1535</p>
1536</li>
1537<li>
1538<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1539<code>D</code> sets <code>foo</code> to &#8220;baz&#8221;. Its merge <code>O</code> combines the strings from
1540 <code>N</code> and <code>D</code> to &#8220;foobarbaz&#8221;; i.e., it is not TREESAME to any parent.
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1541</p>
1542</li>
1543<li>
1544<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1545<code>E</code> changes <code>quux</code> to &#8220;xyzzy&#8221;, and its merge <code>P</code> combines the
1546 strings to &#8220;quux xyzzy&#8221;. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.
Junio C Hamano27159f82013-06-14 17:19:22[diff] [blame]1547</p>
1548</li>
1549<li>
1550<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1551<code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
1552 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
1553 <code>Q</code> is TREESAME to <code>P</code>, but not to <code>Y</code>.
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1554</p>
1555</li>
1556</ul></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1557<div class="paragraph"><p><code>rev-list</code> walks backwards through history, including or excluding
1558commits based on whether <code>--full-history</code> and/or parent rewriting
1559(via <code>--parents</code> or <code>--children</code>) are used. The following settings
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1560are available.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1561<div class="dlist"><dl>
1562<dt class="hdlist1">
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1563Default mode
1564</dt>
1565<dd>
1566<p>
1567 Commits are included if they are not TREESAME to any parent
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1568 (though this can be changed, see <code>--sparse</code> below). If the
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1569 commit was a merge, and it was TREESAME to one parent, follow
1570 only that parent. (Even if there are several TREESAME
1571 parents, follow only one of them.) Otherwise, follow all
1572 parents.
1573</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1574<div class="paragraph"><p>This results in:</p></div>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1575<div class="listingblock">
1576<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1577<pre><code> .-A---N---O
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1578 / / /
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1579 I---------D</code></pre>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1580</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1581<div class="paragraph"><p>Note how the rule to only follow the TREESAME parent, if one is
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1582available, removed <code>B</code> from consideration entirely. <code>C</code> was
1583considered via <code>N</code>, but is TREESAME. Root commits are compared to an
1584empty tree, so <code>I</code> is !TREESAME.</p></div>
1585<div class="paragraph"><p>Parent/child relations are only visible with <code>--parents</code>, but that does
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1586not affect the commits selected in default mode, so we have shown the
1587parent lines.</p></div>
1588</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1589<dt class="hdlist1">
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1590--full-history without parent rewriting
1591</dt>
1592<dd>
1593<p>
1594 This mode differs from the default in one point: always follow
1595 all parents of a merge, even if it is TREESAME to one of them.
1596 Even if more than one side of the merge has commits that are
1597 included, this does not imply that the merge itself is! In
1598 the example, we get
1599</p>
1600<div class="listingblock">
1601<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1602<pre><code> I A B N D O P Q</code></pre>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1603</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1604<div class="paragraph"><p><code>M</code> was excluded because it is TREESAME to both parents. <code>E</code>,
1605<code>C</code> and <code>B</code> were all walked, but only <code>B</code> was !TREESAME, so the others
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1606do not appear.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1607<div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1608about the parent/child relationships between the commits, so we show
1609them disconnected.</p></div>
1610</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1611<dt class="hdlist1">
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1612--full-history with parent rewriting
1613</dt>
1614<dd>
1615<p>
1616 Ordinary commits are only included if they are !TREESAME
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1617 (though this can be changed, see <code>--sparse</code> below).
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1618</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1619<div class="paragraph"><p>Merges are always included. However, their parent list is rewritten:
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1620Along each parent, prune away commits that are not included
1621themselves. This results in</p></div>
1622<div class="listingblock">
1623<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1624<pre><code> .-A---M---N---O---P---Q
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1625 / / / / /
1626 I B / D /
1627 \ / / / /
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1628 `-------------'</code></pre>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1629</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1630<div class="paragraph"><p>Compare to <code>--full-history</code> without rewriting above. Note that <code>E</code>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1631was pruned away because it is TREESAME, but the parent list of P was
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1632rewritten to contain <code>E</code>'s parent <code>I</code>. The same happened for <code>C</code> and
1633<code>N</code>, and <code>X</code>, <code>Y</code> and <code>Q</code>.</p></div>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1634</dd>
1635</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1636<div class="paragraph"><p>In addition to the above settings, you can change whether TREESAME
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1637affects inclusion:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1638<div class="dlist"><dl>
1639<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1640--dense
1641</dt>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1642<dd>
1643<p>
1644 Commits that are walked are included if they are not TREESAME
1645 to any parent.
1646</p>
1647</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1648<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1649--sparse
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1650</dt>
1651<dd>
1652<p>
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1653 All commits that are walked are included.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1654</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1655<div class="paragraph"><p>Note that without <code>--full-history</code>, this still simplifies merges: if
Junio C Hamanoa76cb0d2008-08-13 20:04:10[diff] [blame]1656one of the parents is TREESAME, we follow only that one, so the other
1657sides of the merge are never walked.</p></div>
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1658</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1659<dt class="hdlist1">
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1660--simplify-merges
1661</dt>
1662<dd>
1663<p>
1664 First, build a history graph in the same way that
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1665 <code>--full-history</code> with parent rewriting does (see above).
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1666</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1667<div class="paragraph"><p>Then simplify each commit <code>C</code> to its replacement <code>C'</code> in the final
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1668history according to the following rules:</p></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1669<div class="openblock">
1670<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1671<div class="ulist"><ul>
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1672<li>
1673<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1674Set <code>C'</code> to <code>C</code>.
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1675</p>
1676</li>
1677<li>
1678<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1679Replace each parent <code>P</code> of <code>C'</code> with its simplification <code>P'</code>. In
Junio C Hamano27159f82013-06-14 17:19:22[diff] [blame]1680 the process, drop parents that are ancestors of other parents or that are
1681 root commits TREESAME to an empty tree, and remove duplicates, but take care
1682 to never drop all parents that we are TREESAME to.
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1683</p>
1684</li>
1685<li>
1686<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1687If after this parent rewriting, <code>C'</code> is a root or merge commit (has
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1688 zero or &gt;1 parents), a boundary commit, or !TREESAME, it remains.
1689 Otherwise, it is replaced with its only parent.
1690</p>
1691</li>
1692</ul></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1693</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1694<div class="paragraph"><p>The effect of this is best shown by way of comparing to
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1695<code>--full-history</code> with parent rewriting. The example turns into:</p></div>
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1696<div class="listingblock">
1697<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1698<pre><code> .-A---M---N---O
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1699 / / /
1700 I B D
1701 \ / /
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1702 `---------'</code></pre>
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1703</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1704<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>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1705<div class="openblock">
1706<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1707<div class="ulist"><ul>
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1708<li>
1709<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1710<code>N</code>'s parent list had <code>I</code> removed, because it is an ancestor of the
1711 other parent <code>M</code>. Still, <code>N</code> remained because it is !TREESAME.
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1712</p>
1713</li>
1714<li>
1715<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1716<code>P</code>'s parent list similarly had <code>I</code> removed. <code>P</code> was then
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1717 removed completely, because it had one parent and is TREESAME.
1718</p>
1719</li>
Junio C Hamano27159f82013-06-14 17:19:22[diff] [blame]1720<li>
1721<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1722<code>Q</code>'s parent list had <code>Y</code> simplified to <code>X</code>. <code>X</code> was then removed, because it
1723 was a TREESAME root. <code>Q</code> was then removed completely, because it had one
Junio C Hamano27159f82013-06-14 17:19:22[diff] [blame]1724 parent and is TREESAME.
1725</p>
1726</li>
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1727</ul></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1728</div></div>
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]1729</dd>
1730</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1731<div class="paragraph"><p>Finally, there is a fifth simplification mode available:</p></div>
1732<div class="dlist"><dl>
1733<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1734--ancestry-path
1735</dt>
1736<dd>
1737<p>
1738 Limit the displayed commits to those directly on the ancestry
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]1739 chain between the &#8220;from&#8221; and &#8220;to&#8221; commits in the given commit
1740 range. I.e. only display commits that are ancestor of the &#8220;to&#8221;
1741 commit and descendants of the &#8220;from&#8221; commit.
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1742</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1743<div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1744<div class="listingblock">
1745<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1746<pre><code> D---E-------F
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1747 / \ \
1748 B---C---G---H---I---J
1749 / \
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1750 A-------K---------------L--M</code></pre>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1751</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1752<div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
1753but excludes the ones that are ancestors of <code>D</code>. This is useful to see
1754what happened to the history leading to <code>M</code> since <code>D</code>, in the sense
1755that &#8220;what does <code>M</code> have that did not exist in <code>D</code>&#8221;. The result in this
1756example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1757of course).</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1758<div class="paragraph"><p>When we want to find out what commits in <code>M</code> are contaminated with the
1759bug introduced by <code>D</code> and need fixing, however, we might want to view
1760only the subset of <em>D..M</em> that are actually descendants of <code>D</code>, i.e.
1761excluding <code>C</code> and <code>K</code>. This is exactly what the <code>--ancestry-path</code>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1762option does. Applied to the <em>D..M</em> range, it results in:</p></div>
1763<div class="listingblock">
1764<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1765<pre><code> E-------F
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1766 \ \
1767 G---H---I---J
1768 \
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1769 L--M</code></pre>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1770</div></div>
1771</dd>
1772</dl></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1773<div class="paragraph"><p>The <code>--simplify-by-decoration</code> option allows you to view only the
Junio C Hamano28363492008-11-14 08:26:31[diff] [blame]1774big picture of the topology of the history, by omitting commits
1775that are not referenced by tags. Commits are marked as !TREESAME
1776(in other words, kept after history simplification rules described
1777above) if (1) they are referenced by tags, or (2) they change the
1778contents of the paths given on the command line. All other
1779commits are marked as TREESAME (subject to be simplified away).</p></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1780</div>
1781<div class="sect2">
1782<h3 id="_commit_ordering">Commit Ordering</h3>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1783<div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>
1784<div class="dlist"><dl>
1785<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1786--date-order
1787</dt>
1788<dd>
1789<p>
Junio C Hamanod0316112012-08-22 19:55:29[diff] [blame]1790 Show no parents before all of its children are shown, but
1791 otherwise show commits in the commit timestamp order.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1792</p>
1793</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1794<dt class="hdlist1">
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]1795--author-date-order
1796</dt>
1797<dd>
1798<p>
1799 Show no parents before all of its children are shown, but
1800 otherwise show commits in the author timestamp order.
1801</p>
1802</dd>
1803<dt class="hdlist1">
Junio C Hamanod0316112012-08-22 19:55:29[diff] [blame]1804--topo-order
1805</dt>
1806<dd>
1807<p>
1808 Show no parents before all of its children are shown, and
1809 avoid showing commits on multiple lines of history
1810 intermixed.
1811</p>
1812<div class="paragraph"><p>For example, in a commit history like this:</p></div>
1813<div class="listingblock">
1814<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1815<pre><code> ---1----2----4----7
Junio C Hamanod0316112012-08-22 19:55:29[diff] [blame]1816 \ \
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1817 3----5----6----8---</code></pre>
Junio C Hamanod0316112012-08-22 19:55:29[diff] [blame]1818</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1819<div class="paragraph"><p>where the numbers denote the order of commit timestamps, <code>git
1820rev-list</code> and friends with <code>--date-order</code> show the commits in the
Junio C Hamanod0316112012-08-22 19:55:29[diff] [blame]1821timestamp order: 8 7 6 5 4 3 2 1.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1822<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
Junio C Hamanod0316112012-08-22 19:55:29[diff] [blame]18233 1); some older commits are shown before newer ones in order to
1824avoid showing the commits from two parallel development track mixed
1825together.</p></div>
1826</dd>
1827<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1828--reverse
1829</dt>
1830<dd>
1831<p>
Junio C Hamanof3ca7b82016-10-03 22:27:02[diff] [blame]1832 Output the commits chosen to be shown (see Commit Limiting
1833 section above) in reverse order. Cannot be combined with
1834 <code>--walk-reflogs</code>.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1835</p>
1836</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1837</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1838</div>
1839<div class="sect2">
1840<h3 id="_object_traversal">Object Traversal</h3>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1841<div class="paragraph"><p>These options are mostly targeted for packing of Git repositories.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1842<div class="dlist"><dl>
1843<dt class="hdlist1">
Junio C Hamanoeccdd4a2012-09-10 23:28:17[diff] [blame]1844--no-walk[=(sorted|unsorted)]
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1845</dt>
1846<dd>
1847<p>
Junio C Hamanoeccdd4a2012-09-10 23:28:17[diff] [blame]1848 Only show the given commits, but do not traverse their ancestors.
1849 This has no effect if a range is specified. If the argument
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1850 <code>unsorted</code> is given, the commits are shown in the order they were
1851 given on the command line. Otherwise (if <code>sorted</code> or no argument
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]1852 was given), the commits are shown in reverse chronological order
Junio C Hamanoeccdd4a2012-09-10 23:28:17[diff] [blame]1853 by commit time.
Junio C Hamanoef57d1e2015-03-25 21:23:00[diff] [blame]1854 Cannot be combined with <code>--graph</code>.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1855</p>
1856</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1857<dt class="hdlist1">
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1858--do-walk
1859</dt>
1860<dd>
1861<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1862 Overrides a previous <code>--no-walk</code>.
Junio C Hamanob0e02952008-01-19 08:02:00[diff] [blame]1863</p>
1864</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1865</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1866</div>
1867<div class="sect2">
1868<h3 id="_commit_formatting">Commit Formatting</h3>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1869<div class="dlist"><dl>
1870<dt class="hdlist1">
1871--pretty[=&lt;format&gt;]
1872</dt>
1873<dt class="hdlist1">
1874--format=&lt;format&gt;
1875</dt>
1876<dd>
1877<p>
1878 Pretty-print the contents of the commit logs in a given format,
1879 where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]1880 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em>, <em>format:&lt;string&gt;</em>
1881 and <em>tformat:&lt;string&gt;</em>. When <em>&lt;format&gt;</em> is none of the above,
1882 and has <em>%placeholder</em> in it, it acts as if
1883 <em>--pretty=tformat:&lt;format&gt;</em> were given.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1884</p>
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]1885<div class="paragraph"><p>See the "PRETTY FORMATS" section for some additional details for each
1886format. When <em>=&lt;format&gt;</em> part is omitted, it defaults to <em>medium</em>.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1887<div class="paragraph"><p>Note: you can specify the default pretty format in the repository
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1888configuration (see <a href="git-config.html">git-config(1)</a>).</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1889</dd>
1890<dt class="hdlist1">
1891--abbrev-commit
1892</dt>
1893<dd>
1894<p>
1895 Instead of showing the full 40-byte hexadecimal commit object
1896 name, show only a partial prefix. Non default number of
1897 digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies
1898 diff output, if it is displayed).
1899</p>
1900<div class="paragraph"><p>This should make "--pretty=oneline" a whole lot more readable for
1901people using 80-column terminals.</p></div>
1902</dd>
1903<dt class="hdlist1">
Junio C Hamanof93530e2011-05-25 23:59:59[diff] [blame]1904--no-abbrev-commit
1905</dt>
1906<dd>
1907<p>
1908 Show the full 40-byte hexadecimal commit object name. This negates
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1909 <code>--abbrev-commit</code> and those options which imply it such as
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]1910 "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.
Junio C Hamanof93530e2011-05-25 23:59:59[diff] [blame]1911</p>
1912</dd>
1913<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1914--oneline
1915</dt>
1916<dd>
1917<p>
1918 This is a shorthand for "--pretty=oneline --abbrev-commit"
1919 used together.
1920</p>
1921</dd>
1922<dt class="hdlist1">
Junio C Hamanoc5bb3b32013-08-05 22:43:36[diff] [blame]1923--encoding=&lt;encoding&gt;
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1924</dt>
1925<dd>
1926<p>
1927 The commit objects record the encoding used for the log message
1928 in their encoding header; this option can be used to tell the
1929 command to re-code the commit log message in the encoding
1930 preferred by the user. For non plumbing commands this
Junio C Hamano823eebb2015-07-10 22:29:34[diff] [blame]1931 defaults to UTF-8. Note that if an object claims to be encoded
1932 in <code>X</code> and we are outputting in <code>X</code>, we will output the object
1933 verbatim; this means that invalid sequences in the original
1934 commit may be copied to the output.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1935</p>
1936</dd>
1937<dt class="hdlist1">
Junio C Hamano5996b672016-04-13 22:01:41[diff] [blame]1938--expand-tabs=&lt;n&gt;
1939</dt>
1940<dt class="hdlist1">
1941--expand-tabs
1942</dt>
1943<dt class="hdlist1">
1944--no-expand-tabs
1945</dt>
1946<dd>
1947<p>
1948 Perform a tab expansion (replace each tab with enough spaces
1949 to fill to the next display column that is multiple of <em>&lt;n&gt;</em>)
1950 in the log message before showing it in the output.
1951 <code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
1952 <code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
1953 which disables tab expansion.
1954</p>
1955<div class="paragraph"><p>By default, tabs are expanded in pretty formats that indent the log
1956message by 4 spaces (i.e. <em>medium</em>, which is the default, <em>full</em>,
1957and <em>fuller</em>).</p></div>
1958</dd>
1959<dt class="hdlist1">
Junio C Hamano4e6ba272016-01-20 23:23:19[diff] [blame]1960--notes[=&lt;treeish&gt;]
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1961</dt>
1962<dd>
1963<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1964 Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1965 commit, when showing the commit log message. This is the default
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1966 for <code>git log</code>, <code>git show</code> and <code>git whatchanged</code> commands when
1967 there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]1968 on the command line.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1969</p>
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]1970<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]1971<code>core.notesRef</code> and <code>notes.displayRef</code> variables (or corresponding
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1972environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
Junio C Hamano4e6ba272016-01-20 23:23:19[diff] [blame]1973<div class="paragraph"><p>With an optional <em>&lt;treeish&gt;</em> argument, use the treeish to find the notes
1974to display. The treeish can specify the full refname when it begins
Junio C Hamano1f7c4a52015-10-14 22:15:51[diff] [blame]1975with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
1976<code>refs/notes/</code> is prefixed to form a full name of the ref.</p></div>
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]1977<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
1978being displayed. Examples: "--notes=foo" will show only notes from
1979"refs/notes/foo"; "--notes=foo --notes" will show both notes from
1980"refs/notes/foo" and from the default notes ref(s).</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1981</dd>
1982<dt class="hdlist1">
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]1983--no-notes
1984</dt>
1985<dd>
1986<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1987 Do not show notes. This negates the above <code>--notes</code> option, by
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]1988 resetting the list of notes refs from which notes are shown.
1989 Options are parsed in the order given on the command line, so e.g.
1990 "--notes --notes=foo --no-notes --notes=bar" will only show notes
1991 from "refs/notes/bar".
1992</p>
1993</dd>
1994<dt class="hdlist1">
Junio C Hamano4e6ba272016-01-20 23:23:19[diff] [blame]1995--show-notes[=&lt;treeish&gt;]
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]1996</dt>
1997<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]1998--[no-]standard-notes
1999</dt>
2000<dd>
2001<p>
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]2002 These options are deprecated. Use the above --notes/--no-notes
2003 options instead.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2004</p>
2005</dd>
2006<dt class="hdlist1">
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2007--show-signature
2008</dt>
2009<dd>
2010<p>
2011 Check the validity of a signed commit object by passing the signature
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2012 to <code>gpg --verify</code> and show the output.
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2013</p>
2014</dd>
2015<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2016--relative-date
2017</dt>
2018<dd>
2019<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2020 Synonym for <code>--date=relative</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2021</p>
2022</dd>
2023<dt class="hdlist1">
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]2024--date=&lt;format&gt;
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2025</dt>
2026<dd>
2027<p>
2028 Only takes effect for dates shown in human-readable format, such
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2029 as when using <code>--pretty</code>. <code>log.date</code> config variable sets a default
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]2030 value for the log command&#8217;s <code>--date</code> option. By default, dates
2031 are shown in the original time zone (either committer&#8217;s or
2032 author&#8217;s). If <code>-local</code> is appended to the format (e.g.,
2033 <code>iso-local</code>), the user&#8217;s local time zone is used instead.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2034</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2035<div class="paragraph"><p><code>--date=relative</code> shows dates relative to the current time,
Junio C Hamanoe548d1b2016-08-08 22:26:49[diff] [blame]2036e.g. &#8220;2 hours ago&#8221;. The <code>-local</code> option has no effect for
2037<code>--date=relative</code>.</p></div>
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]2038<div class="paragraph"><p><code>--date=local</code> is an alias for <code>--date=default-local</code>.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2039<div class="paragraph"><p><code>--date=iso</code> (or <code>--date=iso8601</code>) shows timestamps in a ISO 8601-like format.
2040The differences to the strict ISO 8601 format are:</p></div>
2041<div class="ulist"><ul>
2042<li>
2043<p>
2044a space instead of the <code>T</code> date/time delimiter
2045</p>
2046</li>
2047<li>
2048<p>
2049a space between time and time zone
2050</p>
2051</li>
2052<li>
2053<p>
2054no colon between hours and minutes of the time zone
2055</p>
2056</li>
2057</ul></div>
2058<div class="paragraph"><p><code>--date=iso-strict</code> (or <code>--date=iso8601-strict</code>) shows timestamps in strict
2059ISO 8601 format.</p></div>
2060<div class="paragraph"><p><code>--date=rfc</code> (or <code>--date=rfc2822</code>) shows timestamps in RFC 2822
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]2061format, often found in email messages.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2062<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>
Junio C Hamanoe548d1b2016-08-08 22:26:49[diff] [blame]2063<div class="paragraph"><p><code>--date=raw</code> shows the date as seconds since the epoch (1970-01-01
206400:00:00 UTC), followed by a space, and then the timezone as an offset
2065from UTC (a <code>+</code> or <code>-</code> with four digits; the first two are hours, and
2066the second two are minutes). I.e., as if the timestamp were formatted
2067with <code>strftime("%s %z")</code>).
2068Note that the <code>-local</code> option does not affect the seconds-since-epoch
2069value (which is always measured in UTC), but does switch the accompanying
2070timezone value.</p></div>
2071<div class="paragraph"><p><code>--date=unix</code> shows the date as a Unix epoch timestamp (seconds since
20721970). As with <code>--raw</code>, this is always in UTC and therefore <code>-local</code>
2073has no effect.</p></div>
Junio C Hamano55d91912017-06-22 22:32:46[diff] [blame^]2074<div class="paragraph"><p><code>--date=format:...</code> feeds the format <code>...</code> to your system <code>strftime</code>,
2075except for %z and %Z, which are handled internally.
Junio C Hamanod7ed4042015-08-03 19:43:00[diff] [blame]2076Use <code>--date=format:%c</code> to show the date in your system locale&#8217;s
2077preferred format. See the <code>strftime</code> manual for a complete list of
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]2078format placeholders. When using <code>-local</code>, the correct syntax is
2079<code>--date=format-local:...</code>.</p></div>
2080<div class="paragraph"><p><code>--date=default</code> is the default format, and is similar to
2081<code>--date=rfc2822</code>, with a few exceptions:</p></div>
2082<div class="ulist"><ul>
2083<li>
2084<p>
2085there is no comma after the day-of-week
2086</p>
2087</li>
2088<li>
2089<p>
2090the time zone is omitted when the local time zone is used
2091</p>
2092</li>
2093</ul></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2094</dd>
2095<dt class="hdlist1">
2096--parents
2097</dt>
2098<dd>
2099<p>
2100 Print also the parents of the commit (in the form "commit parent&#8230;").
2101 Also enables parent rewriting, see <em>History Simplification</em> below.
2102</p>
2103</dd>
2104<dt class="hdlist1">
2105--children
2106</dt>
2107<dd>
2108<p>
2109 Print also the children of the commit (in the form "commit child&#8230;").
2110 Also enables parent rewriting, see <em>History Simplification</em> below.
2111</p>
2112</dd>
2113<dt class="hdlist1">
2114--left-right
2115</dt>
2116<dd>
2117<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]2118 Mark which side of a symmetric difference a commit is reachable from.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2119 Commits from the left side are prefixed with <code>&lt;</code> and those from
2120 the right with <code>&gt;</code>. If combined with <code>--boundary</code>, those
2121 commits are prefixed with <code>-</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2122</p>
2123<div class="paragraph"><p>For example, if you have this topology:</p></div>
2124<div class="listingblock">
2125<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2126<pre><code> y---b---b branch B
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2127 / \ /
2128 / .
2129 / / \
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2130 o---x---a---a branch A</code></pre>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2131</div></div>
2132<div class="paragraph"><p>you would get an output like this:</p></div>
2133<div class="listingblock">
2134<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2135<pre><code> $ git rev-list --left-right --boundary --pretty=oneline A...B
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2136
2137 &gt;bbbbbbb... 3rd on b
2138 &gt;bbbbbbb... 2nd on b
2139 &lt;aaaaaaa... 3rd on a
2140 &lt;aaaaaaa... 2nd on a
2141 -yyyyyyy... 1st on b
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2142 -xxxxxxx... 1st on a</code></pre>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2143</div></div>
2144</dd>
2145<dt class="hdlist1">
2146--graph
2147</dt>
2148<dd>
2149<p>
2150 Draw a text-based graphical representation of the commit history
2151 on the left hand side of the output. This may cause extra lines
2152 to be printed in between commits, in order for the graph history
2153 to be drawn properly.
Junio C Hamanoef57d1e2015-03-25 21:23:00[diff] [blame]2154 Cannot be combined with <code>--no-walk</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2155</p>
2156<div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2157<div class="paragraph"><p>This implies the <code>--topo-order</code> option by default, but the
2158<code>--date-order</code> option may also be specified.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2159</dd>
Junio C Hamano624dd4c2014-04-03 21:56:30[diff] [blame]2160<dt class="hdlist1">
2161--show-linear-break[=&lt;barrier&gt;]
2162</dt>
2163<dd>
2164<p>
2165 When --graph is not used, all history branches are flattened
2166 which can make it hard to see that the two consecutive commits
2167 do not belong to a linear branch. This option puts a barrier
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2168 in between them in that case. If <code>&lt;barrier&gt;</code> is specified, it
Junio C Hamano624dd4c2014-04-03 21:56:30[diff] [blame]2169 is the string that will be shown instead of the default one.
2170</p>
2171</dd>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2172</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2173</div>
2174<div class="sect2">
2175<h3 id="_diff_formatting">Diff Formatting</h3>
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]2176<div class="paragraph"><p>Listed below are options that control the formatting of diff output.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2177Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
2178options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2179<div class="dlist"><dl>
2180<dt class="hdlist1">
2181-c
2182</dt>
2183<dd>
2184<p>
2185 With this option, diff output for a merge commit
2186 shows the differences from each of the parents to the merge result
2187 simultaneously instead of showing pairwise diff between a parent
2188 and the result one at a time. Furthermore, it lists only files
2189 which were modified from all parents.
2190</p>
2191</dd>
2192<dt class="hdlist1">
2193--cc
2194</dt>
2195<dd>
2196<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2197 This flag implies the <code>-c</code> option and further compresses the
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2198 patch output by omitting uninteresting hunks whose contents in
2199 the parents have only two variants and the merge result picks
2200 one of them without modification.
2201</p>
2202</dd>
2203<dt class="hdlist1">
2204-m
2205</dt>
2206<dd>
2207<p>
2208 This flag makes the merge commits show the full diff like
2209 regular commits; for each merge parent, a separate log entry
2210 and diff is generated. An exception is that only diff against
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2211 the first parent is shown when <code>--first-parent</code> option is given;
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2212 in that case, the output represents the changes the merge
2213 brought <em>into</em> the then-current branch.
2214</p>
2215</dd>
2216<dt class="hdlist1">
2217-r
2218</dt>
2219<dd>
2220<p>
2221 Show recursive diffs.
2222</p>
2223</dd>
2224<dt class="hdlist1">
2225-t
2226</dt>
2227<dd>
2228<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2229 Show the tree objects in the diff output. This implies <code>-r</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2230</p>
2231</dd>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2232</dl></div>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2233</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2234</div>
2235</div>
2236<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2237<h2 id="_pretty_formats">PRETTY FORMATS</h2>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2238<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2239<div class="paragraph"><p>If the commit is a merge, and if the pretty-format
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2240is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
2241inserted before the <em>Author:</em> line. This line begins with
2242"Merge: " and the sha1s of ancestral commits are printed,
2243separated by spaces. Note that the listed commits may not
2244necessarily be the list of the <strong>direct</strong> parent commits if you
2245have limited your view of history: for example, if you are
2246only interested in changes related to a certain directory or
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2247file.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2248<div class="paragraph"><p>There are several built-in formats, and you can define
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]2249additional formats by setting a pretty.&lt;name&gt;
2250config option to either another format name, or a
2251<em>format:</em> string, as described below (see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2252<a href="git-config.html">git-config(1)</a>). Here are the details of the
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]2253built-in formats:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2254<div class="ulist"><ul>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2255<li>
2256<p>
2257<em>oneline</em>
2258</p>
2259<div class="literalblock">
2260<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2261<pre><code>&lt;sha1&gt; &lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2262</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2263<div class="paragraph"><p>This is designed to be as compact as possible.</p></div>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2264</li>
2265<li>
2266<p>
2267<em>short</em>
2268</p>
2269<div class="literalblock">
2270<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2271<pre><code>commit &lt;sha1&gt;
2272Author: &lt;author&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2273</div></div>
2274<div class="literalblock">
2275<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2276<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2277</div></div>
2278</li>
2279<li>
2280<p>
2281<em>medium</em>
2282</p>
2283<div class="literalblock">
2284<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2285<pre><code>commit &lt;sha1&gt;
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2286Author: &lt;author&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2287Date: &lt;author date&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2288</div></div>
2289<div class="literalblock">
2290<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2291<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2292</div></div>
2293<div class="literalblock">
2294<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2295<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2296</div></div>
2297</li>
2298<li>
2299<p>
2300<em>full</em>
2301</p>
2302<div class="literalblock">
2303<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2304<pre><code>commit &lt;sha1&gt;
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2305Author: &lt;author&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2306Commit: &lt;committer&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2307</div></div>
2308<div class="literalblock">
2309<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2310<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2311</div></div>
2312<div class="literalblock">
2313<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2314<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2315</div></div>
2316</li>
2317<li>
2318<p>
2319<em>fuller</em>
2320</p>
2321<div class="literalblock">
2322<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2323<pre><code>commit &lt;sha1&gt;
Junio C Hamano6a3c8272008-12-19 21:38:18[diff] [blame]2324Author: &lt;author&gt;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2325AuthorDate: &lt;author date&gt;
Junio C Hamano6a3c8272008-12-19 21:38:18[diff] [blame]2326Commit: &lt;committer&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2327CommitDate: &lt;committer date&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2328</div></div>
2329<div class="literalblock">
2330<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2331<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2332</div></div>
2333<div class="literalblock">
2334<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2335<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2336</div></div>
2337</li>
2338<li>
2339<p>
2340<em>email</em>
2341</p>
2342<div class="literalblock">
2343<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2344<pre><code>From &lt;sha1&gt; &lt;date&gt;
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2345From: &lt;author&gt;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2346Date: &lt;author date&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2347Subject: [PATCH] &lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2348</div></div>
2349<div class="literalblock">
2350<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2351<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2352</div></div>
2353</li>
2354<li>
2355<p>
2356<em>raw</em>
2357</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2358<div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
Junio C Hamanoe3f080d2013-04-22 02:27:13[diff] [blame]2359stored in the commit object. Notably, the SHA-1s are
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2360displayed in full, regardless of whether --abbrev or
2361--no-abbrev are used, and <em>parents</em> information show the
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]2362true parent commits, without taking grafts or history
Junio C Hamano85f1fde2015-06-01 20:37:32[diff] [blame]2363simplification into account. Note that this format affects the way
2364commits are displayed, but not the way the diff is shown e.g. with
2365<code>git log --raw</code>. To get full object names in a raw diff format,
2366use <code>--no-abbrev</code>.</p></div>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2367</li>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2368<li>
2369<p>
Junio C Hamanoe32ec8b2010-06-02 23:32:31[diff] [blame]2370<em>format:&lt;string&gt;</em>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2371</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2372<div class="paragraph"><p>The <em>format:&lt;string&gt;</em> format allows you to specify which information
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2373you want to show. It works a little bit like printf format,
2374with the notable exception that you get a newline with <em>%n</em>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2375instead of <em>\n</em>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2376<div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was &gt;&gt;%s&lt;&lt;%n"</em>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2377would show something like this:</p></div>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2378<div class="listingblock">
2379<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2380<pre><code>The author of fe6e0ee was Junio C Hamano, 23 hours ago
2381The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff input.&lt;&lt;</code></pre>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2382</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2383<div class="paragraph"><p>The placeholders are:</p></div>
2384<div class="ulist"><ul>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2385<li>
2386<p>
2387<em>%H</em>: commit hash
2388</p>
2389</li>
2390<li>
2391<p>
2392<em>%h</em>: abbreviated commit hash
2393</p>
2394</li>
2395<li>
2396<p>
2397<em>%T</em>: tree hash
2398</p>
2399</li>
2400<li>
2401<p>
2402<em>%t</em>: abbreviated tree hash
2403</p>
2404</li>
2405<li>
2406<p>
2407<em>%P</em>: parent hashes
2408</p>
2409</li>
2410<li>
2411<p>
2412<em>%p</em>: abbreviated parent hashes
2413</p>
2414</li>
2415<li>
2416<p>
2417<em>%an</em>: author name
2418</p>
2419</li>
2420<li>
2421<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2422<em>%aN</em>: author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
2423 or <a href="git-blame.html">git-blame(1)</a>)
Junio C Hamanof5a93622008-07-16 03:23:57[diff] [blame]2424</p>
2425</li>
2426<li>
2427<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2428<em>%ae</em>: author email
2429</p>
2430</li>
2431<li>
2432<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2433<em>%aE</em>: author email (respecting .mailmap, see
2434 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
Junio C Hamano8bc410e2009-02-15 10:38:19[diff] [blame]2435</p>
2436</li>
2437<li>
2438<p>
Junio C Hamanoa387df32008-08-29 08:56:58[diff] [blame]2439<em>%ad</em>: author date (format respects --date= option)
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2440</p>
2441</li>
2442<li>
2443<p>
2444<em>%aD</em>: author date, RFC2822 style
2445</p>
2446</li>
2447<li>
2448<p>
2449<em>%ar</em>: author date, relative
2450</p>
2451</li>
2452<li>
2453<p>
2454<em>%at</em>: author date, UNIX timestamp
2455</p>
2456</li>
2457<li>
2458<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2459<em>%ai</em>: author date, ISO 8601-like format
2460</p>
2461</li>
2462<li>
2463<p>
2464<em>%aI</em>: author date, strict ISO 8601 format
Junio C Hamano02f130b2007-07-14 08:26:56[diff] [blame]2465</p>
2466</li>
2467<li>
2468<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2469<em>%cn</em>: committer name
2470</p>
2471</li>
2472<li>
2473<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2474<em>%cN</em>: committer name (respecting .mailmap, see
2475 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
Junio C Hamanof5a93622008-07-16 03:23:57[diff] [blame]2476</p>
2477</li>
2478<li>
2479<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2480<em>%ce</em>: committer email
2481</p>
2482</li>
2483<li>
2484<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2485<em>%cE</em>: committer email (respecting .mailmap, see
2486 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
Junio C Hamano8bc410e2009-02-15 10:38:19[diff] [blame]2487</p>
2488</li>
2489<li>
2490<p>
Junio C Hamano53fe0312014-09-09 21:16:17[diff] [blame]2491<em>%cd</em>: committer date (format respects --date= option)
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2492</p>
2493</li>
2494<li>
2495<p>
2496<em>%cD</em>: committer date, RFC2822 style
2497</p>
2498</li>
2499<li>
2500<p>
2501<em>%cr</em>: committer date, relative
2502</p>
2503</li>
2504<li>
2505<p>
2506<em>%ct</em>: committer date, UNIX timestamp
2507</p>
2508</li>
2509<li>
2510<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2511<em>%ci</em>: committer date, ISO 8601-like format
2512</p>
2513</li>
2514<li>
2515<p>
2516<em>%cI</em>: committer date, strict ISO 8601 format
Junio C Hamano02f130b2007-07-14 08:26:56[diff] [blame]2517</p>
2518</li>
2519<li>
2520<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2521<em>%d</em>: ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2522</p>
2523</li>
2524<li>
2525<p>
Junio C Hamano00b9f1a2014-09-29 23:11:28[diff] [blame]2526<em>%D</em>: ref names without the " (", ")" wrapping.
2527</p>
2528</li>
2529<li>
2530<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2531<em>%e</em>: encoding
2532</p>
2533</li>
2534<li>
2535<p>
2536<em>%s</em>: subject
2537</p>
2538</li>
2539<li>
2540<p>
Junio C Hamano5f9a6f02009-04-06 08:26:56[diff] [blame]2541<em>%f</em>: sanitized subject line, suitable for a filename
2542</p>
2543</li>
2544<li>
2545<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2546<em>%b</em>: body
2547</p>
2548</li>
2549<li>
2550<p>
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]2551<em>%B</em>: raw body (unwrapped subject and body)
2552</p>
2553</li>
2554<li>
2555<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]2556<em>%N</em>: commit notes
2557</p>
2558</li>
2559<li>
2560<p>
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2561<em>%GG</em>: raw verification message from GPG for a signed commit
2562</p>
2563</li>
2564<li>
2565<p>
Junio C Hamano4a401d52016-10-26 22:24:37[diff] [blame]2566<em>%G?</em>: show "G" for a good (valid) signature,
2567 "B" for a bad signature,
2568 "U" for a good signature with unknown validity,
2569 "X" for a good signature that has expired,
2570 "Y" for a good signature made by an expired key,
2571 "R" for a good signature made by a revoked key,
2572 "E" if the signature cannot be checked (e.g. missing key)
2573 and "N" for no signature
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2574</p>
2575</li>
2576<li>
2577<p>
2578<em>%GS</em>: show the name of the signer for a signed commit
2579</p>
2580</li>
2581<li>
2582<p>
Junio C Hamano5e7f1312013-03-21 22:49:01[diff] [blame]2583<em>%GK</em>: show the key used to sign a signed commit
2584</p>
2585</li>
2586<li>
2587<p>
Junio C Hamanoe548d1b2016-08-08 22:26:49[diff] [blame]2588<em>%gD</em>: reflog selector, e.g., <code>refs/stash@{1}</code> or
2589 <code>refs/stash@{2 minutes ago</code>}; the format follows the rules described
2590 for the <code>-g</code> option. The portion before the <code>@</code> is the refname as
2591 given on the command line (so <code>git log -g refs/heads/master</code> would
2592 yield <code>refs/heads/master@{0}</code>).
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2593</p>
2594</li>
2595<li>
2596<p>
Junio C Hamanoe548d1b2016-08-08 22:26:49[diff] [blame]2597<em>%gd</em>: shortened reflog selector; same as <code>%gD</code>, but the refname
2598 portion is shortened for human readability (so <code>refs/heads/master</code>
2599 becomes just <code>master</code>).
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2600</p>
2601</li>
2602<li>
2603<p>
Junio C Hamano962f3a32011-12-22 20:21:44[diff] [blame]2604<em>%gn</em>: reflog identity name
2605</p>
2606</li>
2607<li>
2608<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2609<em>%gN</em>: reflog identity name (respecting .mailmap, see
2610 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
Junio C Hamano962f3a32011-12-22 20:21:44[diff] [blame]2611</p>
2612</li>
2613<li>
2614<p>
2615<em>%ge</em>: reflog identity email
2616</p>
2617</li>
2618<li>
2619<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2620<em>%gE</em>: reflog identity email (respecting .mailmap, see
2621 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
Junio C Hamano962f3a32011-12-22 20:21:44[diff] [blame]2622</p>
2623</li>
2624<li>
2625<p>
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2626<em>%gs</em>: reflog subject
2627</p>
2628</li>
2629<li>
2630<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2631<em>%Cred</em>: switch color to red
2632</p>
2633</li>
2634<li>
2635<p>
2636<em>%Cgreen</em>: switch color to green
2637</p>
2638</li>
2639<li>
2640<p>
2641<em>%Cblue</em>: switch color to blue
2642</p>
2643</li>
2644<li>
2645<p>
2646<em>%Creset</em>: reset color
2647</p>
2648</li>
2649<li>
2650<p>
Junio C Hamanoc0859f72016-10-17 22:22:57[diff] [blame]2651<em>%C(&#8230;)</em>: color specification, as described under Values in the
2652 "CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2653 adding <code>auto,</code> at the beginning will emit color only when colors are
2654 enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
2655 respecting the <code>auto</code> settings of the former if we are going to a
2656 terminal). <code>auto</code> alone (i.e. <code>%C(auto)</code>) will turn on auto coloring
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2657 on the next placeholders until the color is switched again.
Junio C Hamanocc0cb312009-01-22 03:38:50[diff] [blame]2658</p>
2659</li>
2660<li>
2661<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]2662<em>%m</em>: left (<code>&lt;</code>), right (<code>&gt;</code>) or boundary (<code>-</code>) mark
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]2663</p>
2664</li>
2665<li>
2666<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2667<em>%n</em>: newline
2668</p>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2669</li>
Junio C Hamanob78d2592008-04-09 09:39:08[diff] [blame]2670<li>
2671<p>
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]2672<em>%%</em>: a raw <em>%</em>
2673</p>
2674</li>
2675<li>
2676<p>
Junio C Hamanob78d2592008-04-09 09:39:08[diff] [blame]2677<em>%x00</em>: print a byte from a hex code
2678</p>
2679</li>
Junio C Hamanobf984de2009-11-23 06:11:19[diff] [blame]2680<li>
2681<p>
2682<em>%w([&lt;w&gt;[,&lt;i1&gt;[,&lt;i2&gt;]]])</em>: switch line wrapping, like the -w option of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2683 <a href="git-shortlog.html">git-shortlog(1)</a>.
Junio C Hamanobf984de2009-11-23 06:11:19[diff] [blame]2684</p>
2685</li>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2686<li>
2687<p>
2688<em>%&lt;(&lt;N&gt;[,trunc|ltrunc|mtrunc])</em>: make the next placeholder take at
2689 least N columns, padding spaces on the right if necessary.
2690 Optionally truncate at the beginning (ltrunc), the middle (mtrunc)
2691 or the end (trunc) if the output is longer than N columns.
2692 Note that truncating only works correctly with N &gt;= 2.
2693</p>
2694</li>
2695<li>
2696<p>
2697<em>%&lt;|(&lt;N&gt;)</em>: make the next placeholder take at least until Nth
2698 columns, padding spaces on the right if necessary
2699</p>
2700</li>
2701<li>
2702<p>
2703<em>%&gt;(&lt;N&gt;)</em>, <em>%&gt;|(&lt;N&gt;)</em>: similar to <em>%&lt;(&lt;N&gt;)</em>, <em>%&lt;|(&lt;N&gt;)</em>
2704 respectively, but padding spaces on the left
2705</p>
2706</li>
2707<li>
2708<p>
2709<em>%&gt;&gt;(&lt;N&gt;)</em>, <em>%&gt;&gt;|(&lt;N&gt;)</em>: similar to <em>%&gt;(&lt;N&gt;)</em>, <em>%&gt;|(&lt;N&gt;)</em>
2710 respectively, except that if the next placeholder takes more spaces
2711 than given and there are spaces on its left, use those spaces
2712</p>
2713</li>
2714<li>
2715<p>
2716<em>%&gt;&lt;(&lt;N&gt;)</em>, <em>%&gt;&lt;|(&lt;N&gt;)</em>: similar to <em>% &lt;(&lt;N&gt;)</em>, <em>%&lt;|(&lt;N&gt;)</em>
2717 respectively, but padding both sides (i.e. the text is centered)
Junio C Hamano222ed822017-06-02 06:24:06[diff] [blame]2718</p>
2719</li>
2720<li>
2721<p>
2722%(trailers): display the trailers of the body as interpreted by
Junio C Hamano52b1cfb2016-12-20 00:18:36[diff] [blame]2723 <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2724</p>
2725</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2726</ul></div>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2727</li>
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2728</ul></div>
2729<div class="admonitionblock">
2730<table><tr>
2731<td class="icon">
2732<div class="title">Note</div>
2733</td>
2734<td class="content">Some placeholders may depend on other options given to the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2735revision traversal engine. For example, the <code>%g*</code> reflog options will
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2736insert an empty string unless we are traversing reflog entries (e.g., by
Junio C Hamano00b9f1a2014-09-29 23:11:28[diff] [blame]2737<code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
2738decoration format if <code>--decorate</code> was not already provided on the command
2739line.</td>
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2740</tr></table>
2741</div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2742<div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
Junio C Hamano2bd8a742009-12-01 21:16:59[diff] [blame]2743is inserted immediately before the expansion if and only if the
2744placeholder expands to a non-empty string.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2745<div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, line-feeds that
Junio C Hamano2bd8a742009-12-01 21:16:59[diff] [blame]2746immediately precede the expansion are deleted if and only if the
2747placeholder expands to an empty string.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2748<div class="paragraph"><p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]2749is inserted immediately before the expansion if and only if the
2750placeholder expands to a non-empty string.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2751<div class="ulist"><ul>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2752<li>
2753<p>
2754<em>tformat:</em>
2755</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2756<div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2757provides "terminator" semantics instead of "separator" semantics. In
2758other words, each commit has the message terminator character (usually a
2759newline) appended, rather than a separator placed between entries.
2760This means that the final entry of a single-line format will be properly
2761terminated with a new line, just as the "oneline" format does.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2762For example:</p></div>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2763<div class="listingblock">
2764<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2765<pre><code>$ git log -2 --pretty=format:%h 4da45bef \
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2766 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
27674da45be
27687134973 -- NO NEWLINE
2769
2770$ git log -2 --pretty=tformat:%h 4da45bef \
2771 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
27724da45be
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]27737134973</code></pre>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2774</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2775<div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
2776as if it has <code>tformat:</code> in front of it. For example, these two are
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]2777equivalent:</p></div>
2778<div class="listingblock">
2779<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2780<pre><code>$ git log -2 --pretty=tformat:%h 4da45bef
2781$ git log -2 --pretty=%h 4da45bef</code></pre>
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]2782</div></div>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2783</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2784</ul></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2785</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2786</div>
2787<div class="sect1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]2788<h2 id="_common_diff_options">COMMON DIFF OPTIONS</h2>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2789<div class="sectionbody">
2790<div class="dlist"><dl>
2791<dt class="hdlist1">
2792-p
2793</dt>
2794<dt class="hdlist1">
2795-u
2796</dt>
2797<dt class="hdlist1">
2798--patch
2799</dt>
2800<dd>
2801<p>
2802 Generate patch (see section on generating patches).
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2803</p>
2804</dd>
2805<dt class="hdlist1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]2806-s
2807</dt>
2808<dt class="hdlist1">
2809--no-patch
2810</dt>
2811<dd>
2812<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2813 Suppress diff output. Useful for commands like <code>git show</code> that
2814 show the patch by default, or to cancel the effect of <code>--patch</code>.
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]2815</p>
2816</dd>
2817<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2818-U&lt;n&gt;
2819</dt>
2820<dt class="hdlist1">
2821--unified=&lt;n&gt;
2822</dt>
2823<dd>
2824<p>
2825 Generate diffs with &lt;n&gt; lines of context instead of
2826 the usual three.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2827 Implies <code>-p</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2828</p>
2829</dd>
2830<dt class="hdlist1">
2831--raw
2832</dt>
2833<dd>
2834<p>
Junio C Hamano85f1fde2015-06-01 20:37:32[diff] [blame]2835 For each commit, show a summary of changes using the raw diff
2836 format. See the "RAW OUTPUT FORMAT" section of
2837 <a href="git-diff.html">git-diff(1)</a>. This is different from showing the log
2838 itself in raw format, which you can achieve with
2839 <code>--format=raw</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2840</p>
2841</dd>
2842<dt class="hdlist1">
2843--patch-with-raw
2844</dt>
2845<dd>
2846<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2847 Synonym for <code>-p --raw</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2848</p>
2849</dd>
2850<dt class="hdlist1">
Junio C Hamanoad70bf02016-09-26 23:44:27[diff] [blame]2851--indent-heuristic
2852</dt>
2853<dt class="hdlist1">
2854--no-indent-heuristic
2855</dt>
Junio C Hamano5f888332016-06-13 19:28:31[diff] [blame]2856<dd>
2857<p>
Junio C Hamanoad70bf02016-09-26 23:44:27[diff] [blame]2858 These are to help debugging and tuning experimental heuristics
2859 (which are off by default) that shift diff hunk boundaries to
2860 make patches easier to read.
Junio C Hamano5f888332016-06-13 19:28:31[diff] [blame]2861</p>
2862</dd>
2863<dt class="hdlist1">
Junio C Hamano5a73f302011-10-14 05:58:34[diff] [blame]2864--minimal
2865</dt>
2866<dd>
2867<p>
2868 Spend extra time to make sure the smallest possible
2869 diff is produced.
2870</p>
2871</dd>
2872<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2873--patience
2874</dt>
2875<dd>
2876<p>
2877 Generate a diff using the "patience diff" algorithm.
2878</p>
2879</dd>
2880<dt class="hdlist1">
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]2881--histogram
2882</dt>
2883<dd>
2884<p>
2885 Generate a diff using the "histogram diff" algorithm.
2886</p>
2887</dd>
2888<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]2889--diff-algorithm={patience|minimal|histogram|myers}
2890</dt>
2891<dd>
2892<p>
2893 Choose a diff algorithm. The variants are as follows:
2894</p>
2895<div class="openblock">
2896<div class="content">
2897<div class="dlist"><dl>
2898<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2899<code>default</code>, <code>myers</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]2900</dt>
2901<dd>
2902<p>
2903 The basic greedy diff algorithm. Currently, this is the default.
2904</p>
2905</dd>
2906<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2907<code>minimal</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]2908</dt>
2909<dd>
2910<p>
2911 Spend extra time to make sure the smallest possible diff is
2912 produced.
2913</p>
2914</dd>
2915<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2916<code>patience</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]2917</dt>
2918<dd>
2919<p>
2920 Use "patience diff" algorithm when generating patches.
2921</p>
2922</dd>
2923<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2924<code>histogram</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]2925</dt>
2926<dd>
2927<p>
2928 This algorithm extends the patience algorithm to "support
2929 low-occurrence common elements".
2930</p>
2931</dd>
2932</dl></div>
2933</div></div>
2934<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a
2935non-default value and want to use the default one, then you
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2936have to use <code>--diff-algorithm=default</code> option.</p></div>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]2937</dd>
2938<dt class="hdlist1">
Junio C Hamano4c4b0122011-06-30 01:19:32[diff] [blame]2939--stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2940</dt>
2941<dd>
2942<p>
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]2943 Generate a diffstat. By default, as much space as necessary
2944 will be used for the filename part, and the rest for the graph
2945 part. Maximum width defaults to terminal width, or 80 columns
Junio C Hamano7f2b3cb2012-06-22 22:42:39[diff] [blame]2946 if not connected to a terminal, and can be overridden by
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2947 <code>&lt;width&gt;</code>. The width of the filename part can be limited by
2948 giving another width <code>&lt;name-width&gt;</code> after a comma. The width
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]2949 of the graph part can be limited by using
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2950 <code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
2951 a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
2952 (does not affect <code>git format-patch</code>).
2953 By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
2954 output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]2955 there are more.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2956</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2957<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
2958<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2959</dd>
2960<dt class="hdlist1">
2961--numstat
2962</dt>
2963<dd>
2964<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2965 Similar to <code>--stat</code>, but shows number of added and
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2966 deleted lines in decimal notation and pathname without
2967 abbreviation, to make it more machine friendly. For
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2968 binary files, outputs two <code>-</code> instead of saying
2969 <code>0 0</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2970</p>
2971</dd>
2972<dt class="hdlist1">
2973--shortstat
2974</dt>
2975<dd>
2976<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2977 Output only the last line of the <code>--stat</code> format containing total
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2978 number of modified files, as well as number of added and deleted
2979 lines.
2980</p>
2981</dd>
2982<dt class="hdlist1">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2983--dirstat[=&lt;param1,param2,&#8230;&gt;]
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2984</dt>
2985<dd>
2986<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2987 Output the distribution of relative amount of changes for each
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2988 sub-directory. The behavior of <code>--dirstat</code> can be customized by
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2989 passing it a comma separated list of parameters.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2990 The defaults are controlled by the <code>diff.dirstat</code> configuration
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2991 variable (see <a href="git-config.html">git-config(1)</a>).
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2992 The following parameters are available:
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]2993</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2994<div class="openblock">
2995<div class="content">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2996<div class="dlist"><dl>
2997<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2998<code>changes</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2999</dt>
3000<dd>
3001<p>
3002 Compute the dirstat numbers by counting the lines that have been
3003 removed from the source, or added to the destination. This ignores
3004 the amount of pure code movements within a file. In other words,
3005 rearranging lines in a file is not counted as much as other changes.
3006 This is the default behavior when no parameter is given.
3007</p>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3008</dd>
3009<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3010<code>lines</code>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3011</dt>
3012<dd>
3013<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3014 Compute the dirstat numbers by doing the regular line-based diff
3015 analysis, and summing the removed/added line counts. (For binary
3016 files, count 64-byte chunks instead, since binary files have no
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3017 natural concept of lines). This is a more expensive <code>--dirstat</code>
3018 behavior than the <code>changes</code> behavior, but it does count rearranged
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3019 lines within a file as much as other changes. The resulting output
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3020 is consistent with what you get from the other <code>--*stat</code> options.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3021</p>
3022</dd>
3023<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3024<code>files</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3025</dt>
3026<dd>
3027<p>
3028 Compute the dirstat numbers by counting the number of files changed.
3029 Each changed file counts equally in the dirstat analysis. This is
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3030 the computationally cheapest <code>--dirstat</code> behavior, since it does
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3031 not have to look at the file contents at all.
3032</p>
3033</dd>
3034<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3035<code>cumulative</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3036</dt>
3037<dd>
3038<p>
3039 Count changes in a child directory for the parent directory as well.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3040 Note that when using <code>cumulative</code>, the sum of the percentages
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3041 reported may exceed 100%. The default (non-cumulative) behavior can
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3042 be specified with the <code>noncumulative</code> parameter.
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3043</p>
3044</dd>
3045<dt class="hdlist1">
3046&lt;limit&gt;
3047</dt>
3048<dd>
3049<p>
3050 An integer parameter specifies a cut-off percent (3% by default).
3051 Directories contributing less than this percentage of the changes
3052 are not shown in the output.
3053</p>
3054</dd>
3055</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3056</div></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3057<div class="paragraph"><p>Example: The following will count changed files, while ignoring
3058directories with less than 10% of the total amount of changed files,
3059and accumulating child directory counts in the parent directories:
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3060<code>--dirstat=files,10,cumulative</code>.</p></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]3061</dd>
3062<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3063--summary
3064</dt>
3065<dd>
3066<p>
3067 Output a condensed summary of extended header information
3068 such as creations, renames and mode changes.
3069</p>
3070</dd>
3071<dt class="hdlist1">
3072--patch-with-stat
3073</dt>
3074<dd>
3075<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3076 Synonym for <code>-p --stat</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3077</p>
3078</dd>
3079<dt class="hdlist1">
3080-z
3081</dt>
3082<dd>
3083<p>
3084 Separate the commits with NULs instead of with new newlines.
3085</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3086<div class="paragraph"><p>Also, when <code>--raw</code> or <code>--numstat</code> has been given, do not munge
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3087pathnames and use NULs as output field terminators.</p></div>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]3088<div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
3089explained for the configuration variable <code>core.quotePath</code> (see
3090<a href="git-config.html">git-config(1)</a>).</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3091</dd>
3092<dt class="hdlist1">
3093--name-only
3094</dt>
3095<dd>
3096<p>
3097 Show only names of changed files.
3098</p>
3099</dd>
3100<dt class="hdlist1">
3101--name-status
3102</dt>
3103<dd>
3104<p>
3105 Show only names and status of changed files. See the description
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3106 of the <code>--diff-filter</code> option on what the status letters mean.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3107</p>
3108</dd>
3109<dt class="hdlist1">
3110--submodule[=&lt;format&gt;]
3111</dt>
3112<dd>
3113<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]3114 Specify how differences in submodules are shown. When specifying
3115 <code>--submodule=short</code> the <em>short</em> format is used. This format just
3116 shows the names of the commits at the beginning and end of the range.
3117 When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em>
3118 format is used. This format lists the commits in the range like
3119 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
3120 is specified, the <em>diff</em> format is used. This format shows an
3121 inline diff of the changes in the submodule contents between the
3122 commit range. Defaults to <code>diff.submodule</code> or the <em>short</em> format
3123 if the config option is unset.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3124</p>
3125</dd>
3126<dt class="hdlist1">
3127--color[=&lt;when&gt;]
3128</dt>
3129<dd>
3130<p>
3131 Show colored diff.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3132 <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
3133 <em>&lt;when&gt;</em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3134</p>
3135</dd>
3136<dt class="hdlist1">
3137--no-color
3138</dt>
3139<dd>
3140<p>
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]3141 Turn off colored diff.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3142 It is the same as <code>--color=never</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3143</p>
3144</dd>
3145<dt class="hdlist1">
3146--word-diff[=&lt;mode&gt;]
3147</dt>
3148<dd>
3149<p>
3150 Show a word diff, using the &lt;mode&gt; to delimit changed words.
3151 By default, words are delimited by whitespace; see
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3152 <code>--word-diff-regex</code> below. The &lt;mode&gt; defaults to <em>plain</em>, and
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3153 must be one of:
3154</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3155<div class="openblock">
3156<div class="content">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3157<div class="dlist"><dl>
3158<dt class="hdlist1">
3159color
3160</dt>
3161<dd>
3162<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3163 Highlight changed words using only colors. Implies <code>--color</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3164</p>
3165</dd>
3166<dt class="hdlist1">
3167plain
3168</dt>
3169<dd>
3170<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3171 Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3172 attempts to escape the delimiters if they appear in the input,
3173 so the output may be ambiguous.
3174</p>
3175</dd>
3176<dt class="hdlist1">
3177porcelain
3178</dt>
3179<dd>
3180<p>
3181 Use a special line-based format intended for script
3182 consumption. Added/removed/unchanged runs are printed in the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3183 usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3184 character at the beginning of the line and extending to the
3185 end of the line. Newlines in the input are represented by a
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3186 tilde <code>~</code> on a line of its own.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3187</p>
3188</dd>
3189<dt class="hdlist1">
3190none
3191</dt>
3192<dd>
3193<p>
3194 Disable word diff again.
3195</p>
3196</dd>
3197</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3198</div></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3199<div class="paragraph"><p>Note that despite the name of the first mode, color is used to
3200highlight the changed parts in all modes if enabled.</p></div>
3201</dd>
3202<dt class="hdlist1">
3203--word-diff-regex=&lt;regex&gt;
3204</dt>
3205<dd>
3206<p>
3207 Use &lt;regex&gt; to decide what a word is, instead of considering
3208 runs of non-whitespace to be a word. Also implies
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3209 <code>--word-diff</code> unless it was already enabled.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3210</p>
3211<div class="paragraph"><p>Every non-overlapping match of the
3212&lt;regex&gt; is considered a word. Anything between these matches is
3213considered whitespace and ignored(!) for the purposes of finding
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3214differences. You may want to append <code>|[^[:space:]]</code> to your regular
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3215expression to make sure that it matches all non-whitespace characters.
3216A match that contains a newline is silently truncated(!) at the
3217newline.</p></div>
Junio C Hamano713eded2015-12-03 00:24:02[diff] [blame]3218<div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
3219and, correspondingly, show differences character by character.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3220<div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
Junio C Hamano198b1f12016-05-17 22:27:24[diff] [blame]3221<a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3222overrides any diff driver or configuration setting. Diff drivers
3223override configuration settings.</p></div>
3224</dd>
3225<dt class="hdlist1">
3226--color-words[=&lt;regex&gt;]
3227</dt>
3228<dd>
3229<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3230 Equivalent to <code>--word-diff=color</code> plus (if a regex was
3231 specified) <code>--word-diff-regex=&lt;regex&gt;</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3232</p>
3233</dd>
3234<dt class="hdlist1">
3235--no-renames
3236</dt>
3237<dd>
3238<p>
3239 Turn off rename detection, even when the configuration
3240 file gives the default to do so.
3241</p>
3242</dd>
3243<dt class="hdlist1">
3244--check
3245</dt>
3246<dd>
3247<p>
Junio C Hamano84ea1e42016-04-08 21:53:48[diff] [blame]3248 Warn if changes introduce conflict markers or whitespace errors.
3249 What are considered whitespace errors is controlled by <code>core.whitespace</code>
Junio C Hamano6005bfa2011-06-23 00:51:22[diff] [blame]3250 configuration. By default, trailing whitespaces (including
3251 lines that solely consist of whitespaces) and a space character
3252 that is immediately followed by a tab character inside the
3253 initial indent of the line are considered whitespace errors.
3254 Exits with non-zero status if problems are found. Not compatible
3255 with --exit-code.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3256</p>
3257</dd>
3258<dt class="hdlist1">
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]3259--ws-error-highlight=&lt;kind&gt;
3260</dt>
3261<dd>
3262<p>
3263 Highlight whitespace errors on lines specified by &lt;kind&gt;
3264 in the color specified by <code>color.diff.whitespace</code>. &lt;kind&gt;
3265 is a comma separated list of <code>old</code>, <code>new</code>, <code>context</code>. When
3266 this option is not given, only whitespace errors in <code>new</code>
3267 lines are highlighted. E.g. <code>--ws-error-highlight=new,old</code>
3268 highlights whitespace errors on both deleted and added lines.
3269 <code>all</code> can be used as a short-hand for <code>old,new,context</code>.
Junio C Hamano4a401d52016-10-26 22:24:37[diff] [blame]3270 The <code>diff.wsErrorHighlight</code> configuration variable can be
3271 used to specify the default behaviour.
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]3272</p>
3273</dd>
3274<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3275--full-index
3276</dt>
3277<dd>
3278<p>
3279 Instead of the first handful of characters, show the full
3280 pre- and post-image blob object names on the "index"
3281 line when generating patch format output.
3282</p>
3283</dd>
3284<dt class="hdlist1">
3285--binary
3286</dt>
3287<dd>
3288<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3289 In addition to <code>--full-index</code>, output a binary diff that
3290 can be applied with <code>git-apply</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3291</p>
3292</dd>
3293<dt class="hdlist1">
3294--abbrev[=&lt;n&gt;]
3295</dt>
3296<dd>
3297<p>
3298 Instead of showing the full 40-byte hexadecimal object
3299 name in diff-raw format output and diff-tree header
3300 lines, show only a partial prefix. This is
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3301 independent of the <code>--full-index</code> option above, which controls
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3302 the diff-patch output format. Non default number of
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3303 digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3304</p>
3305</dd>
3306<dt class="hdlist1">
3307-B[&lt;n&gt;][/&lt;m&gt;]
3308</dt>
3309<dt class="hdlist1">
3310--break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]
3311</dt>
3312<dd>
3313<p>
3314 Break complete rewrite changes into pairs of delete and
3315 create. This serves two purposes:
3316</p>
3317<div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
3318not as a series of deletion and insertion mixed together with a very
3319few lines that happen to match textually as the context, but as a
3320single deletion of everything old followed by a single insertion of
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3321everything new, and the number <code>m</code> controls this aspect of the -B
3322option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]3323original should remain in the result for Git to consider it a total
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3324rewrite (i.e. otherwise the resulting patch will be a series of
3325deletion and insertion mixed together with context lines).</p></div>
3326<div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
3327source of a rename (usually -M only considers a file that disappeared
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3328as the source of a rename), and the number <code>n</code> controls this aspect of
3329the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3330addition and deletion compared to 20% or more of the file&#8217;s size are
3331eligible for being picked up as a possible source of a rename to
3332another file.</p></div>
3333</dd>
3334<dt class="hdlist1">
3335-M[&lt;n&gt;]
3336</dt>
3337<dt class="hdlist1">
3338--find-renames[=&lt;n&gt;]
3339</dt>
3340<dd>
3341<p>
3342 If generating diffs, detect and report renames for each commit.
3343 For following files across renames while traversing history, see
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3344 <code>--follow</code>.
3345 If <code>n</code> is specified, it is a threshold on the similarity
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3346 index (i.e. amount of addition/deletions compared to the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3347 file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3348 delete/add pair to be a rename if more than 90% of the file
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3349 hasn&#8217;t changed. Without a <code>%</code> sign, the number is to be read as
3350 a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
3351 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
3352 the same as <code>-M5%</code>. To limit detection to exact renames, use
3353 <code>-M100%</code>. The default similarity index is 50%.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3354</p>
3355</dd>
3356<dt class="hdlist1">
3357-C[&lt;n&gt;]
3358</dt>
3359<dt class="hdlist1">
3360--find-copies[=&lt;n&gt;]
3361</dt>
3362<dd>
3363<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3364 Detect copies as well as renames. See also <code>--find-copies-harder</code>.
3365 If <code>n</code> is specified, it has the same meaning as for <code>-M&lt;n&gt;</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3366</p>
3367</dd>
3368<dt class="hdlist1">
3369--find-copies-harder
3370</dt>
3371<dd>
3372<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3373 For performance reasons, by default, <code>-C</code> option finds copies only
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3374 if the original file of the copy was modified in the same
3375 changeset. This flag makes the command
3376 inspect unmodified files as candidates for the source of
3377 copy. This is a very expensive operation for large
3378 projects, so use it with caution. Giving more than one
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3379 <code>-C</code> option has the same effect.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3380</p>
3381</dd>
3382<dt class="hdlist1">
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]3383-D
3384</dt>
3385<dt class="hdlist1">
3386--irreversible-delete
3387</dt>
3388<dd>
3389<p>
3390 Omit the preimage for deletes, i.e. print only the header but not
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3391 the diff between the preimage and <code>/dev/null</code>. The resulting patch
3392 is not meant to be applied with <code>patch</code> or <code>git apply</code>; this is
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]3393 solely for people who want to just concentrate on reviewing the
3394 text after the change. In addition, the output obviously lack
3395 enough information to apply such a patch in reverse, even manually,
3396 hence the name of the option.
3397</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3398<div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]3399of a delete/create pair.</p></div>
3400</dd>
3401<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3402-l&lt;num&gt;
3403</dt>
3404<dd>
3405<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3406 The <code>-M</code> and <code>-C</code> options require O(n^2) processing time where n
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3407 is the number of potential rename/copy targets. This
3408 option prevents rename/copy detection from running if
3409 the number of rename/copy targets exceeds the specified
3410 number.
3411</p>
3412</dd>
3413<dt class="hdlist1">
3414--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;[*]]
3415</dt>
3416<dd>
3417<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3418 Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
3419 Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
3420 type (i.e. regular file, symlink, submodule, &#8230;) changed (<code>T</code>),
3421 are Unmerged (<code>U</code>), are
3422 Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3423 Any combination of the filter characters (including none) can be used.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3424 When <code>*</code> (All-or-none) is added to the combination, all
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3425 paths are selected if there is any file that matches
3426 other criteria in the comparison; if there is no file
3427 that matches other criteria, nothing is selected.
3428</p>
Junio C Hamanoeed15af2016-07-25 22:49:42[diff] [blame]3429<div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude. E.g.
3430<code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3431</dd>
3432<dt class="hdlist1">
3433-S&lt;string&gt;
3434</dt>
3435<dd>
3436<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3437 Look for differences that change the number of occurrences of
3438 the specified string (i.e. addition/deletion) in a file.
3439 Intended for the scripter&#8217;s use.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3440</p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3441<div class="paragraph"><p>It is useful when you&#8217;re looking for an exact block of code (like a
3442struct), and want to know the history of that block since it first
3443came into being: use the feature iteratively to feed the interesting
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3444block in the preimage back into <code>-S</code>, and keep going until you get the
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3445very first version of the block.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3446</dd>
3447<dt class="hdlist1">
3448-G&lt;regex&gt;
3449</dt>
3450<dd>
3451<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3452 Look for differences whose patch text contains added/removed
3453 lines that match &lt;regex&gt;.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3454</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3455<div class="paragraph"><p>To illustrate the difference between <code>-S&lt;regex&gt; --pickaxe-regex</code> and
3456<code>-G&lt;regex&gt;</code>, consider a commit with the following diff in the same
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3457file:</p></div>
3458<div class="listingblock">
3459<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3460<pre><code>+ return !regexec(regexp, two-&gt;ptr, 1, &amp;regmatch, 0);
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3461...
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3462- hit = !regexec(regexp, mf2.ptr, 1, &amp;regmatch, 0);</code></pre>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3463</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3464<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
3465-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3466occurrences of that string did not change).</p></div>
3467<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
3468information.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3469</dd>
3470<dt class="hdlist1">
3471--pickaxe-all
3472</dt>
3473<dd>
3474<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3475 When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3476 changeset, not just the files that contain the change
3477 in &lt;string&gt;.
3478</p>
3479</dd>
3480<dt class="hdlist1">
3481--pickaxe-regex
3482</dt>
3483<dd>
3484<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3485 Treat the &lt;string&gt; given to <code>-S</code> as an extended POSIX regular
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]3486 expression to match.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3487</p>
3488</dd>
3489<dt class="hdlist1">
3490-O&lt;orderfile&gt;
3491</dt>
3492<dd>
3493<p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]3494 Control the order in which files appear in the output.
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]3495 This overrides the <code>diff.orderFile</code> configuration variable
3496 (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>,
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3497 use <code>-O/dev/null</code>.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3498</p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]3499<div class="paragraph"><p>The output order is determined by the order of glob patterns in
3500&lt;orderfile&gt;.
3501All files with pathnames that match the first pattern are output
3502first, all files with pathnames that match the second pattern (but not
3503the first) are output next, and so on.
3504All files with pathnames that do not match any pattern are output
3505last, as if there was an implicit match-all pattern at the end of the
3506file.
3507If multiple pathnames have the same rank (they match the same pattern
3508but no earlier patterns), their output order relative to each other is
3509the normal order.</p></div>
3510<div class="paragraph"><p>&lt;orderfile&gt; is parsed as follows:</p></div>
3511<div class="openblock">
3512<div class="content">
3513<div class="ulist"><ul>
3514<li>
3515<p>
3516Blank lines are ignored, so they can be used as separators for
3517 readability.
3518</p>
3519</li>
3520<li>
3521<p>
3522Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
3523 for comments. Add a backslash ("<code>\</code>") to the beginning of the
3524 pattern if it starts with a hash.
3525</p>
3526</li>
3527<li>
3528<p>
3529Each other line contains a single pattern.
3530</p>
3531</li>
3532</ul></div>
3533</div></div>
3534<div class="paragraph"><p>Patterns have the same syntax and semantics as patterns used for
3535fnmantch(3) without the FNM_PATHNAME flag, except a pathname also
3536matches a pattern if removing any number of the final pathname
3537components matches the pattern. For example, the pattern "<code>foo*bar</code>"
3538matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3539</dd>
3540<dt class="hdlist1">
3541-R
3542</dt>
3543<dd>
3544<p>
3545 Swap two inputs; that is, show differences from index or
3546 on-disk file to tree contents.
3547</p>
3548</dd>
3549<dt class="hdlist1">
3550--relative[=&lt;path&gt;]
3551</dt>
3552<dd>
3553<p>
3554 When run from a subdirectory of the project, it can be
3555 told to exclude changes outside the directory and show
3556 pathnames relative to it with this option. When you are
3557 not in a subdirectory (e.g. in a bare repository), you
3558 can name which subdirectory to make the output relative
3559 to by giving a &lt;path&gt; as an argument.
3560</p>
3561</dd>
3562<dt class="hdlist1">
3563-a
3564</dt>
3565<dt class="hdlist1">
3566--text
3567</dt>
3568<dd>
3569<p>
3570 Treat all files as text.
3571</p>
3572</dd>
3573<dt class="hdlist1">
3574--ignore-space-at-eol
3575</dt>
3576<dd>
3577<p>
3578 Ignore changes in whitespace at EOL.
3579</p>
3580</dd>
3581<dt class="hdlist1">
3582-b
3583</dt>
3584<dt class="hdlist1">
3585--ignore-space-change
3586</dt>
3587<dd>
3588<p>
3589 Ignore changes in amount of whitespace. This ignores whitespace
3590 at line end, and considers all other sequences of one or
3591 more whitespace characters to be equivalent.
3592</p>
3593</dd>
3594<dt class="hdlist1">
3595-w
3596</dt>
3597<dt class="hdlist1">
3598--ignore-all-space
3599</dt>
3600<dd>
3601<p>
3602 Ignore whitespace when comparing lines. This ignores
3603 differences even if one line has whitespace where the other
3604 line has none.
3605</p>
3606</dd>
3607<dt class="hdlist1">
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]3608--ignore-blank-lines
3609</dt>
3610<dd>
3611<p>
3612 Ignore changes whose lines are all blank.
3613</p>
3614</dd>
3615<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3616--inter-hunk-context=&lt;lines&gt;
3617</dt>
3618<dd>
3619<p>
3620 Show the context between diff hunks, up to the specified number
3621 of lines, thereby fusing hunks that are close to each other.
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]3622 Defaults to <code>diff.interHunkContext</code> or 0 if the config option
3623 is unset.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3624</p>
3625</dd>
3626<dt class="hdlist1">
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]3627-W
3628</dt>
3629<dt class="hdlist1">
3630--function-context
3631</dt>
3632<dd>
3633<p>
3634 Show whole surrounding functions of changes.
3635</p>
3636</dd>
3637<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3638--ext-diff
3639</dt>
3640<dd>
3641<p>
3642 Allow an external diff helper to be executed. If you set an
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3643 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
3644 to use this option with <a href="git-log.html">git-log(1)</a> and friends.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3645</p>
3646</dd>
3647<dt class="hdlist1">
3648--no-ext-diff
3649</dt>
3650<dd>
3651<p>
3652 Disallow external diff drivers.
3653</p>
3654</dd>
3655<dt class="hdlist1">
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]3656--textconv
3657</dt>
3658<dt class="hdlist1">
3659--no-textconv
3660</dt>
3661<dd>
3662<p>
3663 Allow (or disallow) external text conversion filters to be run
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3664 when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]3665 details. Because textconv filters are typically a one-way
3666 conversion, the resulting diff is suitable for human
3667 consumption, but cannot be applied. For this reason, textconv
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3668 filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
3669 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]3670 diff plumbing commands.
3671</p>
3672</dd>
3673<dt class="hdlist1">
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3674--ignore-submodules[=&lt;when&gt;]
3675</dt>
3676<dd>
3677<p>
3678 Ignore changes to submodules in the diff generation. &lt;when&gt; can be
Junio C Hamanoc7102962013-05-29 23:57:17[diff] [blame]3679 either "none", "untracked", "dirty" or "all", which is the default.
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3680 Using "none" will consider the submodule modified when it either contains
3681 untracked or modified files or its HEAD differs from the commit recorded
3682 in the superproject and can be used to override any settings of the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3683 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3684 "untracked" is used submodules are not considered dirty when they only
3685 contain untracked content (but they are still scanned for modified
3686 content). Using "dirty" ignores all changes to the work tree of submodules,
3687 only changes to the commits stored in the superproject are shown (this was
3688 the behavior until 1.7.0). Using "all" hides all changes to submodules.
3689</p>
3690</dd>
3691<dt class="hdlist1">
3692--src-prefix=&lt;prefix&gt;
3693</dt>
3694<dd>
3695<p>
3696 Show the given source prefix instead of "a/".
3697</p>
3698</dd>
3699<dt class="hdlist1">
3700--dst-prefix=&lt;prefix&gt;
3701</dt>
3702<dd>
3703<p>
3704 Show the given destination prefix instead of "b/".
3705</p>
3706</dd>
3707<dt class="hdlist1">
3708--no-prefix
3709</dt>
3710<dd>
3711<p>
3712 Do not show any source or destination prefix.
3713</p>
3714</dd>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]3715<dt class="hdlist1">
3716--line-prefix=&lt;prefix&gt;
3717</dt>
3718<dd>
3719<p>
3720 Prepend an additional prefix to every line of output.
3721</p>
3722</dd>
Junio C Hamanof7017f12016-10-27 23:31:34[diff] [blame]3723<dt class="hdlist1">
3724--ita-invisible-in-index
3725</dt>
3726<dd>
3727<p>
3728 By default entries added by "git add -N" appear as an existing
3729 empty file in "git diff" and a new file in "git diff --cached".
3730 This option makes the entry appear as a new file in "git diff"
3731 and non-existent in "git diff --cached". This option could be
3732 reverted with <code>--ita-visible-in-index</code>. Both options are
3733 experimental and could be removed in future.
3734</p>
3735</dd>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3736</dl></div>
3737<div class="paragraph"><p>For more detailed explanation on these common options, see also
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3738<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3739</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3740</div>
3741<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3742<h2 id="_generating_patches_with_p">Generating patches with -p</h2>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3743<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3744<div class="paragraph"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]3745with a <code>-p</code> option, "git diff" without the <code>--raw</code> option, or
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3746"git log" with the "-p" option, they
3747do not produce the output described above; instead they produce a
3748patch file. You can customize the creation of such patches via the
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]3749<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3750<div class="paragraph"><p>What the -p option produces is slightly different from the traditional
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3751diff format:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3752<div class="olist arabic"><ol class="arabic">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3753<li>
3754<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3755It is preceded with a "git diff" header that looks like this:
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3756</p>
3757<div class="literalblock">
3758<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3759<pre><code>diff --git a/file1 b/file2</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3760</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3761<div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3762involved. Especially, even for a creation or a deletion,
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3763<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
3764<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3765name of the source file of the rename/copy and the name of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3766the file that rename/copy produces, respectively.</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3767</li>
3768<li>
3769<p>
3770It is followed by one or more extended header lines:
3771</p>
3772<div class="literalblock">
3773<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3774<pre><code>old mode &lt;mode&gt;
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3775new mode &lt;mode&gt;
3776deleted file mode &lt;mode&gt;
3777new file mode &lt;mode&gt;
3778copy from &lt;path&gt;
3779copy to &lt;path&gt;
3780rename from &lt;path&gt;
3781rename to &lt;path&gt;
3782similarity index &lt;number&gt;
3783dissimilarity index &lt;number&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3784index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3785</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3786<div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3787and file permission bits.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3788<div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3789<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3790the dissimilarity index is the percentage of changed lines. It
3791is a rounded down integer, followed by a percent sign. The
3792similarity index value of 100% is thus reserved for two equal
3793files, while 100% dissimilarity means that no line from the old
3794file made it into the new one.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3795<div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3796The &lt;mode&gt; is included if the file mode does not change; otherwise,
3797separate lines indicate the old and the new mode.</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3798</li>
3799<li>
3800<p>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]3801Pathnames with "unusual" characters are quoted as explained for
3802 the configuration variable <code>core.quotePath</code> (see
3803 <a href="git-config.html">git-config(1)</a>).
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3804</p>
3805</li>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3806<li>
3807<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3808All the <code>file1</code> files in the output refer to files before the
3809 commit, and all the <code>file2</code> files refer to files after the commit.
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3810 It is incorrect to apply each change to each file sequentially. For
3811 example, this patch will swap a and b:
3812</p>
3813<div class="literalblock">
3814<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3815<pre><code>diff --git a/a b/b
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3816rename from a
3817rename to b
3818diff --git a/b b/a
3819rename from b
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3820rename to a</code></pre>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3821</div></div>
3822</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3823</ol></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3824</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3825</div>
3826<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3827<h2 id="_combined_diff_format">combined diff format</h2>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3828<div class="sectionbody">
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]3829<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
Junio C Hamanoc5be4cc2011-03-09 07:20:43[diff] [blame]3830produce a <em>combined diff</em> when showing a merge. This is the default
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3831format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]3832<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any
Junio C Hamanoc5be4cc2011-03-09 07:20:43[diff] [blame]3833of these commands to force generation of diffs with individual parents
3834of a merge.</p></div>
3835<div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3836<div class="listingblock">
3837<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3838<pre><code>diff --combined describe.c
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3839index fabadb8,cc95eb0..4866510
3840--- a/describe.c
3841+++ b/describe.c
3842@@@ -98,20 -98,12 +98,20 @@@
3843 return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
3844 }
3845
3846- static void describe(char *arg)
3847 -static void describe(struct commit *cmit, int last_one)
3848++static void describe(char *arg, int last_one)
3849 {
3850 + unsigned char sha1[20];
3851 + struct commit *cmit;
3852 struct commit_list *list;
3853 static int initialized = 0;
3854 struct commit_name *n;
3855
3856 + if (get_sha1(arg, sha1) &lt; 0)
3857 + usage(describe_usage);
3858 + cmit = lookup_commit_reference(sha1);
3859 + if (!cmit)
3860 + usage(describe_usage);
3861 +
3862 if (!initialized) {
3863 initialized = 1;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3864 for_each_ref(get_name);</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3865</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3866<div class="olist arabic"><ol class="arabic">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3867<li>
3868<p>
3869It is preceded with a "git diff" header, that looks like
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]3870 this (when <code>-c</code> option is used):
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3871</p>
3872<div class="literalblock">
3873<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3874<pre><code>diff --combined file</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3875</div></div>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]3876<div class="paragraph"><p>or like this (when <code>--cc</code> option is used):</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3877<div class="literalblock">
3878<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3879<pre><code>diff --cc file</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3880</div></div>
3881</li>
3882<li>
3883<p>
3884It is followed by one or more extended header lines
3885 (this example shows a merge with two parents):
3886</p>
3887<div class="literalblock">
3888<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3889<pre><code>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3890mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
3891new file mode &lt;mode&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3892deleted file mode &lt;mode&gt;,&lt;mode&gt;</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3893</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3894<div class="paragraph"><p>The <code>mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;</code> line appears only if at least one of
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3895the &lt;mode&gt; is different from the rest. Extended headers with
3896information about detected contents movement (renames and
3897copying detection) are designed to work with diff of two
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3898&lt;tree-ish&gt; and are not used by combined diff format.</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3899</li>
3900<li>
3901<p>
3902It is followed by two-line from-file/to-file header
3903</p>
3904<div class="literalblock">
3905<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3906<pre><code>--- a/file
3907+++ b/file</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3908</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3909<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3910format, <code>/dev/null</code> is used to signal created or deleted
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3911files.</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3912</li>
3913<li>
3914<p>
3915Chunk header format is modified to prevent people from
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3916 accidentally feeding it to <code>patch -p1</code>. Combined diff format
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3917 was created for review of merge commit changes, and was not
3918 meant for apply. The change is similar to the change in the
3919 extended <em>index</em> header:
3920</p>
3921<div class="literalblock">
3922<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3923<pre><code>@@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@</code></pre>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3924</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3925<div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3926header for combined diff format.</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3927</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3928</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3929<div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3930files A and B with a single column that has <code>-</code> (minus&#8201;&#8212;&#8201;appears in A but removed in B), <code>+</code> (plus&#8201;&#8212;&#8201;missing in A but
3931added to B), or <code>" "</code> (space&#8201;&#8212;&#8201;unchanged) prefix, this format
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3932compares two or more files file1, file2,&#8230; with one file X, and
3933shows how X differs from each of fileN. One column for each of
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3934fileN is prepended to the output line to note how X&#8217;s line is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3935different from it.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3936<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
3937fileN but it does not appear in the result. A <code>+</code> character
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]3938in the column N means that the line appears in the result,
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3939and fileN does not have that line (in other words, the line was
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3940added, from the point of view of that parent).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3941<div class="paragraph"><p>In the above example output, the function signature was changed
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3942from both files (hence two <code>-</code> removals from both file1 and
3943file2, plus <code>++</code> to mean one line that was added does not appear
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]3944in either file1 or file2). Also eight other lines are the same
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3945from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
3946<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3947merge commit with the merge result (i.e. file1..fileN are the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3948parents). When shown by <code>git diff-files -c</code>, it compares the
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3949two unresolved merge parents with the working tree file
3950(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3951"their version").</p></div>
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]3952</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3953</div>
3954<div class="sect1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]3955<h2 id="_examples">EXAMPLES</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3956<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3957<div class="dlist"><dl>
3958<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3959<code>git log --no-merges</code>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3960</dt>
3961<dd>
3962<p>
3963 Show the whole commit history, but skip any merges
3964</p>
3965</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3966<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3967<code>git log v2.6.12.. include/scsi drivers/scsi</code>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3968</dt>
3969<dd>
3970<p>
3971 Show all commits since version <em>v2.6.12</em> that changed any file
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3972 in the <code>include/scsi</code> or <code>drivers/scsi</code> subdirectories
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3973</p>
3974</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3975<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3976<code>git log --since="2 weeks ago" -- gitk</code>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3977</dt>
3978<dd>
3979<p>
3980 Show the changes during the last two weeks to the file <em>gitk</em>.
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]3981 The &#8220;--&#8221; is necessary to avoid confusion with the <strong>branch</strong> named
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3982 <em>gitk</em>
3983</p>
3984</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3985<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3986<code>git log --name-status release..test</code>
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]3987</dt>
3988<dd>
3989<p>
3990 Show the commits that are in the "test" branch but not yet
3991 in the "release" branch, along with the list of paths
3992 each commit modifies.
3993</p>
3994</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3995<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3996<code>git log --follow builtin/rev-list.c</code>
Junio C Hamano235d53f2007-07-13 00:25:15[diff] [blame]3997</dt>
3998<dd>
3999<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4000 Shows the commits that changed <code>builtin/rev-list.c</code>, including
Junio C Hamano235d53f2007-07-13 00:25:15[diff] [blame]4001 those commits that occurred before the file was given its
4002 present name.
4003</p>
4004</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4005<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4006<code>git log --branches --not --remotes=origin</code>
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]4007</dt>
4008<dd>
4009<p>
4010 Shows all commits that are in any of local branches but not in
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]4011 any of remote-tracking branches for <em>origin</em> (what you have that
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4012 origin doesn&#8217;t).
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]4013</p>
4014</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4015<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4016<code>git log master --not --remotes=*/master</code>
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]4017</dt>
4018<dd>
4019<p>
4020 Shows all commits that are in local master but not in any remote
4021 repository master branches.
4022</p>
4023</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4024<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4025<code>git log -p -m --first-parent</code>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4026</dt>
4027<dd>
4028<p>
4029 Shows the history including change diffs, but only from the
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]4030 &#8220;main branch&#8221; perspective, skipping commits that come from merged
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4031 branches, and showing full diffs of changes introduced by the merges.
4032 This makes sense only when following a strict policy of merging all
4033 topic branches when staying on a single integration branch.
4034</p>
4035</dd>
Junio C Hamano693e7092012-09-12 22:56:53[diff] [blame]4036<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4037<code>git log -L '/int main/',/^}/:main.c</code>
Junio C Hamano7e590a12013-06-02 23:46:52[diff] [blame]4038</dt>
4039<dd>
4040<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4041 Shows how the function <code>main()</code> in the file <code>main.c</code> evolved
Junio C Hamano7e590a12013-06-02 23:46:52[diff] [blame]4042 over time.
4043</p>
4044</dd>
4045<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4046<code>git log -3</code>
Junio C Hamano693e7092012-09-12 22:56:53[diff] [blame]4047</dt>
4048<dd>
4049<p>
4050 Limits the number of commits to show to 3.
4051</p>
4052</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4053</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]4054</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]4055</div>
4056<div class="sect1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]4057<h2 id="_discussion">DISCUSSION</h2>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4058<div class="sectionbody">
Junio C Hamanod7ed4042015-08-03 19:43:00[diff] [blame]4059<div class="paragraph"><p>Git is to some extent character encoding agnostic.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4060<div class="ulist"><ul>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4061<li>
4062<p>
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]4063The contents of the blob objects are uninterpreted sequences
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4064 of bytes. There is no encoding translation at the core
4065 level.
4066</p>
4067</li>
4068<li>
4069<p>
Junio C Hamanod7ed4042015-08-03 19:43:00[diff] [blame]4070Path names are encoded in UTF-8 normalization form C. This
4071 applies to tree objects, the index file, ref names, as well as
4072 path names in command line arguments, environment variables
4073 and config files (<code>.git/config</code> (see <a href="git-config.html">git-config(1)</a>),
4074 <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and
4075 <a href="gitmodules.html">gitmodules(5)</a>).
4076</p>
4077<div class="paragraph"><p>Note that Git at the core level treats path names simply as
4078sequences of non-NUL bytes, there are no path name encoding
4079conversions (except on Mac and Windows). Therefore, using
4080non-ASCII path names will mostly work even on platforms and file
4081systems that use legacy extended ASCII encodings. However,
4082repositories created on such systems will not work properly on
4083UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa.
4084Additionally, many Git-based tools simply assume path names to
4085be UTF-8 and will fail to display other encodings correctly.</p></div>
4086</li>
4087<li>
4088<p>
4089Commit log messages are typically encoded in UTF-8, but other
4090 extended ASCII encodings are also supported. This includes
4091 ISO-8859-x, CP125x and many others, but <em>not</em> UTF-16/32,
4092 EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5,
4093 EUC-x, CP9xx etc.).
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4094</p>
4095</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4096</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4097<div class="paragraph"><p>Although we encourage that the commit log messages are encoded
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4098in UTF-8, both the core and Git Porcelain are designed not to
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4099force UTF-8 on projects. If all participants of a particular
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4100project find it more convenient to use legacy encodings, Git
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4101does not forbid it. However, there are a few things to keep in
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4102mind.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4103<div class="olist arabic"><ol class="arabic">
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4104<li>
4105<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]4106<em>git commit</em> and <em>git commit-tree</em> issues
Junio C Hamano14b76482008-01-05 10:32:26[diff] [blame]4107 a warning if the commit log message given to it does not look
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4108 like a valid UTF-8 string, unless you explicitly say your
4109 project uses a legacy encoding. The way to say this is to
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4110 have i18n.commitencoding in <code>.git/config</code> file, like this:
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4111</p>
4112<div class="listingblock">
4113<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4114<pre><code>[i18n]
4115 commitencoding = ISO-8859-1</code></pre>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4116</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4117<div class="paragraph"><p>Commit objects created with the above setting record the value
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4118of <code>i18n.commitencoding</code> in its <code>encoding</code> header. This is to
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4119help other people who look at them later. Lack of this header
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4120implies that the commit log message is encoded in UTF-8.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4121</li>
4122<li>
4123<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]4124<em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4125 <code>encoding</code> header of a commit object, and try to re-code the
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]4126 log message into UTF-8 unless otherwise specified. You can
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4127 specify the desired output encoding with
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4128 <code>i18n.logoutputencoding</code> in <code>.git/config</code> file, like this:
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4129</p>
4130<div class="listingblock">
4131<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4132<pre><code>[i18n]
4133 logoutputencoding = ISO-8859-1</code></pre>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4134</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4135<div class="paragraph"><p>If you do not have this configuration variable, the value of
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4136<code>i18n.commitencoding</code> is used instead.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4137</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4138</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4139<div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4140message when a commit is made to force UTF-8 at the commit
4141object level, because re-coding to UTF-8 is not necessarily a
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4142reversible operation.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]4143</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]4144</div>
4145<div class="sect1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]4146<h2 id="_configuration">CONFIGURATION</h2>
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4147<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4148<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>
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4149for settings related to diff generation.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4150<div class="dlist"><dl>
4151<dt class="hdlist1">
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4152format.pretty
4153</dt>
4154<dd>
4155<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4156 Default for the <code>--format</code> option. (See <em>Pretty Formats</em> above.)
4157 Defaults to <code>medium</code>.
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4158</p>
4159</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4160<dt class="hdlist1">
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4161i18n.logOutputEncoding
4162</dt>
4163<dd>
4164<p>
Junio C Hamanob73af6c2013-12-03 22:07:11[diff] [blame]4165 Encoding to use when displaying logs. (See <em>Discussion</em> above.)
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4166 Defaults to the value of <code>i18n.commitEncoding</code> if set, and UTF-8
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4167 otherwise.
4168</p>
4169</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4170<dt class="hdlist1">
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4171log.date
4172</dt>
4173<dd>
4174<p>
4175 Default format for human-readable dates. (Compare the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4176 <code>--date</code> option.) Defaults to "default", which means to write
4177 dates like <code>Sat May 8 19:35:34 2010 -0500</code>.
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4178</p>
4179</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4180<dt class="hdlist1">
Junio C Hamanod7ed4042015-08-03 19:43:00[diff] [blame]4181log.follow
4182</dt>
4183<dd>
4184<p>
Junio C Hamanob0a1e832015-10-15 23:08:31[diff] [blame]4185 If <code>true</code>, <code>git log</code> will act as if the <code>--follow</code> option was used when
4186 a single &lt;path&gt; is given. This has the same limitations as <code>--follow</code>,
4187 i.e. it cannot be used to follow multiple files and does not work well
4188 on non-linear history.
Junio C Hamanod7ed4042015-08-03 19:43:00[diff] [blame]4189</p>
4190</dd>
4191<dt class="hdlist1">
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]4192log.showRoot
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4193</dt>
4194<dd>
4195<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4196 If <code>false</code>, <code>git log</code> and related commands will not treat the
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4197 initial commit as a big creation event. Any root commits in
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4198 <code>git log -p</code> output would be shown without a diff attached.
4199 The default is <code>true</code>.
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4200</p>
4201</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4202<dt class="hdlist1">
Junio C Hamano48931e22016-07-11 20:08:47[diff] [blame]4203log.showSignature
4204</dt>
4205<dd>
4206<p>
4207 If <code>true</code>, <code>git log</code> and related commands will act as if the
4208 <code>--show-signature</code> option was passed to them.
4209</p>
4210</dd>
4211<dt class="hdlist1">
Junio C Hamanoabad6da2013-01-06 09:06:32[diff] [blame]4212mailmap.*
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4213</dt>
4214<dd>
4215<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4216 See <a href="git-shortlog.html">git-shortlog(1)</a>.
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4217</p>
4218</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4219<dt class="hdlist1">
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4220notes.displayRef
4221</dt>
4222<dd>
4223<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4224 Which refs, in addition to the default set by <code>core.notesRef</code>
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]4225 or <code>GIT_NOTES_REF</code>, to read notes from when showing commit
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4226 messages with the <code>log</code> family of commands. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4227 <a href="git-notes.html">git-notes(1)</a>.
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4228</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4229<div class="paragraph"><p>May be an unabbreviated ref name or a glob and may be specified
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4230multiple times. A warning will be issued for refs that do not exist,
4231but a glob that does not match any refs is silently ignored.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4232<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option,
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]4233overridden by the <code>GIT_NOTES_DISPLAY_REF</code> environment variable,
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]4234and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]4235</dd>
4236</dl></div>
4237</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]4238</div>
4239<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4240<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]4241<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4242<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]4243</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]4244</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]4245</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]4246<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]4247<div id="footer">
4248<div id="footer-text">
Junio C Hamanoa275c1f2017-06-19 20:10:12[diff] [blame]4249Last updated 2016-07-11 13:08:30 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]4250</div>
4251</div>
4252</body>
4253</html>