Google Git
Sign in
chromium / external / gitster / git-htmldocs / a65b67605da51cd9b94659acdac8984dd205dcc7 / . / git-diff-tree.html
blob: f9339852ca64a07995118dcff7a6a69b7d4516b6 [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-diff-tree(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-diff-tree(1) Manual Page
738</h1>
739<h2>NAME</h2>
740<div class="sectionbody">
741<p>git-diff-tree -
742 Compares the content and mode of blobs found via two tree objects
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 Hamano235a91e2006-01-07 01:13:58[diff] [blame]750<div class="verseblock">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]751<pre class="content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]752 [-t] [-r] [-c | --cc] [--root] [&lt;common diff options&gt;]
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]753 &lt;tree-ish&gt; [&lt;tree-ish&gt;] [&lt;path&gt;&#8230;]</pre>
754<div class="attribution">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]755</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]756</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]757</div>
758<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]759<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]760<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]761<div class="paragraph"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>
762<div class="paragraph"><p>If there is only one &lt;tree-ish&gt; given, the commit is compared with its parents
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]763(see --stdin below).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]764<div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]765</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]766</div>
767<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]768<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]769<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]770<div class="dlist"><dl>
771<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]772-p
773</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]774<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]775-u
776</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]777<dt class="hdlist1">
Junio C Hamanoe97d5772010-05-19 08:13:58[diff] [blame]778--patch
779</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]780<dd>
781<p>
Junio C Hamanoff979792007-11-16 10:11:30[diff] [blame]782 Generate patch (see section on generating patches).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]783</p>
784</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]785<dt class="hdlist1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]786-s
787</dt>
788<dt class="hdlist1">
789--no-patch
790</dt>
791<dd>
792<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]793 Suppress diff output. Useful for commands like <code>git show</code> that
794 show the patch by default, or to cancel the effect of <code>--patch</code>.
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]795</p>
796</dd>
797<dt class="hdlist1">
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]798-U&lt;n&gt;
799</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]800<dt class="hdlist1">
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]801--unified=&lt;n&gt;
802</dt>
803<dd>
804<p>
805 Generate diffs with &lt;n&gt; lines of context instead of
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]806 the usual three.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]807 Implies <code>-p</code>.
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]808</p>
809</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]810<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]811--raw
812</dt>
813<dd>
814<p>
Junio C Hamano85f1fde2015-06-01 20:37:32[diff] [blame]815 Generate the diff in raw format.
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]816 This is the default.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]817</p>
818</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]819<dt class="hdlist1">
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]820--patch-with-raw
821</dt>
822<dd>
823<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]824 Synonym for <code>-p --raw</code>.
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]825</p>
826</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]827<dt class="hdlist1">
Junio C Hamanoad70bf02016-09-26 23:44:27[diff] [blame]828--indent-heuristic
829</dt>
Junio C Hamanoa65b6762017-11-06 04:45:42[diff] [blame^]830<dd>
831<p>
832 Enable the heuristic that shift diff hunk boundaries to make patches
833 easier to read. This is the default.
834</p>
835</dd>
Junio C Hamanoad70bf02016-09-26 23:44:27[diff] [blame]836<dt class="hdlist1">
837--no-indent-heuristic
838</dt>
Junio C Hamano5f888332016-06-13 19:28:31[diff] [blame]839<dd>
840<p>
Junio C Hamanoa65b6762017-11-06 04:45:42[diff] [blame^]841 Disable the indent heuristic.
Junio C Hamano5f888332016-06-13 19:28:31[diff] [blame]842</p>
843</dd>
844<dt class="hdlist1">
Junio C Hamano5a73f302011-10-14 05:58:34[diff] [blame]845--minimal
846</dt>
847<dd>
848<p>
849 Spend extra time to make sure the smallest possible
850 diff is produced.
851</p>
852</dd>
853<dt class="hdlist1">
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]854--patience
855</dt>
856<dd>
857<p>
858 Generate a diff using the "patience diff" algorithm.
859</p>
860</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]861<dt class="hdlist1">
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]862--histogram
863</dt>
864<dd>
865<p>
866 Generate a diff using the "histogram diff" algorithm.
867</p>
868</dd>
869<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]870--diff-algorithm={patience|minimal|histogram|myers}
871</dt>
872<dd>
873<p>
874 Choose a diff algorithm. The variants are as follows:
875</p>
876<div class="openblock">
877<div class="content">
878<div class="dlist"><dl>
879<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]880<code>default</code>, <code>myers</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]881</dt>
882<dd>
883<p>
884 The basic greedy diff algorithm. Currently, this is the default.
885</p>
886</dd>
887<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]888<code>minimal</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]889</dt>
890<dd>
891<p>
892 Spend extra time to make sure the smallest possible diff is
893 produced.
894</p>
895</dd>
896<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]897<code>patience</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]898</dt>
899<dd>
900<p>
901 Use "patience diff" algorithm when generating patches.
902</p>
903</dd>
904<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]905<code>histogram</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]906</dt>
907<dd>
908<p>
909 This algorithm extends the patience algorithm to "support
910 low-occurrence common elements".
911</p>
912</dd>
913</dl></div>
914</div></div>
915<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a
916non-default value and want to use the default one, then you
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]917have to use <code>--diff-algorithm=default</code> option.</p></div>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]918</dd>
919<dt class="hdlist1">
Junio C Hamano4c4b0122011-06-30 01:19:32[diff] [blame]920--stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]921</dt>
922<dd>
923<p>
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]924 Generate a diffstat. By default, as much space as necessary
925 will be used for the filename part, and the rest for the graph
926 part. Maximum width defaults to terminal width, or 80 columns
Junio C Hamano7f2b3cb2012-06-22 22:42:39[diff] [blame]927 if not connected to a terminal, and can be overridden by
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]928 <code>&lt;width&gt;</code>. The width of the filename part can be limited by
929 giving another width <code>&lt;name-width&gt;</code> after a comma. The width
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]930 of the graph part can be limited by using
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]931 <code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
932 a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
933 (does not affect <code>git format-patch</code>).
934 By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
935 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]936 there are more.
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]937</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]938<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
939<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]940</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]941<dt class="hdlist1">
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]942--numstat
943</dt>
944<dd>
945<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]946 Similar to <code>--stat</code>, but shows number of added and
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]947 deleted lines in decimal notation and pathname without
Junio C Hamanod793de52006-12-26 09:11:43[diff] [blame]948 abbreviation, to make it more machine friendly. For
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]949 binary files, outputs two <code>-</code> instead of saying
950 <code>0 0</code>.
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]951</p>
952</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]953<dt class="hdlist1">
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]954--shortstat
955</dt>
956<dd>
957<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]958 Output only the last line of the <code>--stat</code> format containing total
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]959 number of modified files, as well as number of added and deleted
960 lines.
961</p>
962</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]963<dt class="hdlist1">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]964--dirstat[=&lt;param1,param2,&#8230;&gt;]
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]965</dt>
966<dd>
967<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]968 Output the distribution of relative amount of changes for each
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]969 sub-directory. The behavior of <code>--dirstat</code> can be customized by
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]970 passing it a comma separated list of parameters.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]971 The defaults are controlled by the <code>diff.dirstat</code> configuration
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]972 variable (see <a href="git-config.html">git-config(1)</a>).
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]973 The following parameters are available:
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]974</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]975<div class="openblock">
976<div class="content">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]977<div class="dlist"><dl>
978<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]979<code>changes</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]980</dt>
981<dd>
982<p>
983 Compute the dirstat numbers by counting the lines that have been
984 removed from the source, or added to the destination. This ignores
985 the amount of pure code movements within a file. In other words,
986 rearranging lines in a file is not counted as much as other changes.
987 This is the default behavior when no parameter is given.
988</p>
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]989</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]990<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]991<code>lines</code>
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]992</dt>
993<dd>
994<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]995 Compute the dirstat numbers by doing the regular line-based diff
996 analysis, and summing the removed/added line counts. (For binary
997 files, count 64-byte chunks instead, since binary files have no
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]998 natural concept of lines). This is a more expensive <code>--dirstat</code>
999 behavior than the <code>changes</code> behavior, but it does count rearranged
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1000 lines within a file as much as other changes. The resulting output
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1001 is consistent with what you get from the other <code>--*stat</code> options.
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1002</p>
1003</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1004<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1005<code>files</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1006</dt>
1007<dd>
1008<p>
1009 Compute the dirstat numbers by counting the number of files changed.
1010 Each changed file counts equally in the dirstat analysis. This is
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1011 the computationally cheapest <code>--dirstat</code> behavior, since it does
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1012 not have to look at the file contents at all.
1013</p>
1014</dd>
1015<dt class="hdlist1">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1016<code>cumulative</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1017</dt>
1018<dd>
1019<p>
1020 Count changes in a child directory for the parent directory as well.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1021 Note that when using <code>cumulative</code>, the sum of the percentages
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1022 reported may exceed 100%. The default (non-cumulative) behavior can
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1023 be specified with the <code>noncumulative</code> parameter.
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1024</p>
1025</dd>
1026<dt class="hdlist1">
1027&lt;limit&gt;
1028</dt>
1029<dd>
1030<p>
1031 An integer parameter specifies a cut-off percent (3% by default).
1032 Directories contributing less than this percentage of the changes
1033 are not shown in the output.
1034</p>
1035</dd>
1036</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1037</div></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1038<div class="paragraph"><p>Example: The following will count changed files, while ignoring
1039directories with less than 10% of the total amount of changed files,
1040and accumulating child directory counts in the parent directories:
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1041<code>--dirstat=files,10,cumulative</code>.</p></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1042</dd>
1043<dt class="hdlist1">
Junio C Hamano6959c6c2006-05-17 10:34:11[diff] [blame]1044--summary
1045</dt>
1046<dd>
1047<p>
1048 Output a condensed summary of extended header information
1049 such as creations, renames and mode changes.
1050</p>
1051</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1052<dt class="hdlist1">
Junio C Hamanod1308c92006-04-16 11:01:09[diff] [blame]1053--patch-with-stat
1054</dt>
1055<dd>
1056<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1057 Synonym for <code>-p --stat</code>.
Junio C Hamanod1308c92006-04-16 11:01:09[diff] [blame]1058</p>
1059</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1060<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1061-z
1062</dt>
1063<dd>
1064<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1065 When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
Junio C Hamano0c053e82010-04-19 06:46:34[diff] [blame]1066 given, do not munge pathnames and use NULs as output field terminators.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1067</p>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]1068<div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1069explained for the configuration variable <code>core.quotePath</code> (see
1070<a href="git-config.html">git-config(1)</a>).</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1071</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1072<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1073--name-only
1074</dt>
1075<dd>
1076<p>
1077 Show only names of changed files.
1078</p>
1079</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1080<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1081--name-status
1082</dt>
1083<dd>
1084<p>
Junio C Hamanoa9aee782008-04-23 16:09:20[diff] [blame]1085 Show only names and status of changed files. See the description
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1086 of the <code>--diff-filter</code> option on what the status letters mean.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1087</p>
1088</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1089<dt class="hdlist1">
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1090--submodule[=&lt;format&gt;]
1091</dt>
1092<dd>
1093<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]1094 Specify how differences in submodules are shown. When specifying
1095 <code>--submodule=short</code> the <em>short</em> format is used. This format just
1096 shows the names of the commits at the beginning and end of the range.
1097 When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em>
1098 format is used. This format lists the commits in the range like
1099 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1100 is specified, the <em>diff</em> format is used. This format shows an
1101 inline diff of the changes in the submodule contents between the
1102 commit range. Defaults to <code>diff.submodule</code> or the <em>short</em> format
1103 if the config option is unset.
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1104</p>
1105</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1106<dt class="hdlist1">
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]1107--color[=&lt;when&gt;]
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1108</dt>
1109<dd>
1110<p>
1111 Show colored diff.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1112 <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
1113 <em>&lt;when&gt;</em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1114</p>
1115</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1116<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1117--no-color
1118</dt>
1119<dd>
1120<p>
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]1121 Turn off colored diff.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1122 It is the same as <code>--color=never</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1123</p>
1124</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1125<dt class="hdlist1">
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1126--color-moved[=&lt;mode&gt;]
1127</dt>
1128<dd>
1129<p>
1130 Moved lines of code are colored differently.
1131 The &lt;mode&gt; defaults to <em>no</em> if the option is not given
1132 and to <em>zebra</em> if the option with no mode is given.
1133 The mode must be one of:
1134</p>
1135<div class="openblock">
1136<div class="content">
1137<div class="dlist"><dl>
1138<dt class="hdlist1">
1139no
1140</dt>
1141<dd>
1142<p>
1143 Moved lines are not highlighted.
1144</p>
1145</dd>
1146<dt class="hdlist1">
1147default
1148</dt>
1149<dd>
1150<p>
1151 Is a synonym for <code>zebra</code>. This may change to a more sensible mode
1152 in the future.
1153</p>
1154</dd>
1155<dt class="hdlist1">
1156plain
1157</dt>
1158<dd>
1159<p>
1160 Any line that is added in one location and was removed
1161 in another location will be colored with <em>color.diff.newMoved</em>.
1162 Similarly <em>color.diff.oldMoved</em> will be used for removed lines
1163 that are added somewhere else in the diff. This mode picks up any
1164 moved line, but it is not very useful in a review to determine
1165 if a block of code was moved without permutation.
1166</p>
1167</dd>
1168<dt class="hdlist1">
1169zebra
1170</dt>
1171<dd>
1172<p>
1173 Blocks of moved text of at least 20 alphanumeric characters
1174 are detected greedily. The detected blocks are
1175 painted using either the <em>color.diff.{old,new}Moved</em> color or
1176 <em>color.diff.{old,new}MovedAlternative</em>. The change between
1177 the two colors indicates that a new block was detected.
1178</p>
1179</dd>
1180<dt class="hdlist1">
1181dimmed_zebra
1182</dt>
1183<dd>
1184<p>
1185 Similar to <em>zebra</em>, but additional dimming of uninteresting parts
1186 of moved code is performed. The bordering lines of two adjacent
1187 blocks are considered interesting, the rest is uninteresting.
1188</p>
1189</dd>
1190</dl></div>
1191</div></div>
1192</dd>
1193<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1194--word-diff[=&lt;mode&gt;]
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1195</dt>
1196<dd>
1197<p>
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1198 Show a word diff, using the &lt;mode&gt; to delimit changed words.
1199 By default, words are delimited by whitespace; see
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1200 <code>--word-diff-regex</code> below. The &lt;mode&gt; defaults to <em>plain</em>, and
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1201 must be one of:
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1202</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1203<div class="openblock">
1204<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1205<div class="dlist"><dl>
1206<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1207color
1208</dt>
1209<dd>
1210<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1211 Highlight changed words using only colors. Implies <code>--color</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1212</p>
1213</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1214<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1215plain
1216</dt>
1217<dd>
1218<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1219 Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1220 attempts to escape the delimiters if they appear in the input,
1221 so the output may be ambiguous.
1222</p>
1223</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1224<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1225porcelain
1226</dt>
1227<dd>
1228<p>
1229 Use a special line-based format intended for script
1230 consumption. Added/removed/unchanged runs are printed in the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1231 usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1232 character at the beginning of the line and extending to the
1233 end of the line. Newlines in the input are represented by a
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1234 tilde <code>~</code> on a line of its own.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1235</p>
1236</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1237<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1238none
1239</dt>
1240<dd>
1241<p>
1242 Disable word diff again.
1243</p>
1244</dd>
1245</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1246</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1247<div class="paragraph"><p>Note that despite the name of the first mode, color is used to
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1248highlight the changed parts in all modes if enabled.</p></div>
1249</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1250<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1251--word-diff-regex=&lt;regex&gt;
1252</dt>
1253<dd>
1254<p>
1255 Use &lt;regex&gt; to decide what a word is, instead of considering
1256 runs of non-whitespace to be a word. Also implies
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1257 <code>--word-diff</code> unless it was already enabled.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1258</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1259<div class="paragraph"><p>Every non-overlapping match of the
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1260&lt;regex&gt; is considered a word. Anything between these matches is
1261considered whitespace and ignored(!) for the purposes of finding
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1262differences. You may want to append <code>|[^[:space:]]</code> to your regular
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1263expression to make sure that it matches all non-whitespace characters.
1264A match that contains a newline is silently truncated(!) at the
1265newline.</p></div>
Junio C Hamano713eded2015-12-03 00:24:02[diff] [blame]1266<div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1267and, correspondingly, show differences character by character.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1268<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]1269<a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1270overrides any diff driver or configuration setting. Diff drivers
1271override configuration settings.</p></div>
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1272</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1273<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1274--color-words[=&lt;regex&gt;]
1275</dt>
1276<dd>
1277<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1278 Equivalent to <code>--word-diff=color</code> plus (if a regex was
1279 specified) <code>--word-diff-regex=&lt;regex&gt;</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1280</p>
1281</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1282<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1283--no-renames
1284</dt>
1285<dd>
1286<p>
1287 Turn off rename detection, even when the configuration
1288 file gives the default to do so.
1289</p>
1290</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1291<dt class="hdlist1">
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1292--check
1293</dt>
1294<dd>
1295<p>
Junio C Hamano84ea1e42016-04-08 21:53:48[diff] [blame]1296 Warn if changes introduce conflict markers or whitespace errors.
1297 What are considered whitespace errors is controlled by <code>core.whitespace</code>
Junio C Hamano6005bfa2011-06-23 00:51:22[diff] [blame]1298 configuration. By default, trailing whitespaces (including
1299 lines that solely consist of whitespaces) and a space character
1300 that is immediately followed by a tab character inside the
1301 initial indent of the line are considered whitespace errors.
1302 Exits with non-zero status if problems are found. Not compatible
1303 with --exit-code.
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1304</p>
1305</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1306<dt class="hdlist1">
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]1307--ws-error-highlight=&lt;kind&gt;
1308</dt>
1309<dd>
1310<p>
Junio C Hamano4b2a6c12017-08-22 18:32:37[diff] [blame]1311 Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
1312 lines of the diff. Multiple values are separated by comma,
1313 <code>none</code> resets previous values, <code>default</code> reset the list to
1314 <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. When
1315 this option is not given, and the configuration variable
1316 <code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
1317 <code>new</code> lines are highlighted. The whitespace errors are colored
1318 whith <code>color.diff.whitespace</code>.
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]1319</p>
1320</dd>
1321<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1322--full-index
1323</dt>
1324<dd>
1325<p>
Junio C Hamano5cf43ca2008-08-20 09:14:14[diff] [blame]1326 Instead of the first handful of characters, show the full
1327 pre- and post-image blob object names on the "index"
1328 line when generating patch format output.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1329</p>
1330</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1331<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1332--binary
1333</dt>
1334<dd>
1335<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1336 In addition to <code>--full-index</code>, output a binary diff that
1337 can be applied with <code>git-apply</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1338</p>
1339</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1340<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1341--abbrev[=&lt;n&gt;]
1342</dt>
1343<dd>
1344<p>
1345 Instead of showing the full 40-byte hexadecimal object
1346 name in diff-raw format output and diff-tree header
Junio C Hamano6efe3022009-01-13 16:47:56[diff] [blame]1347 lines, show only a partial prefix. This is
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1348 independent of the <code>--full-index</code> option above, which controls
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1349 the diff-patch output format. Non default number of
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1350 digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1351</p>
1352</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1353<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1354-B[&lt;n&gt;][/&lt;m&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1355</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1356<dt class="hdlist1">
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1357--break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]
1358</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1359<dd>
1360<p>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1361 Break complete rewrite changes into pairs of delete and
1362 create. This serves two purposes:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1363</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1364<div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1365not as a series of deletion and insertion mixed together with a very
1366few lines that happen to match textually as the context, but as a
1367single deletion of everything old followed by a single insertion of
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1368everything new, and the number <code>m</code> controls this aspect of the -B
1369option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1370original should remain in the result for Git to consider it a total
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1371rewrite (i.e. otherwise the resulting patch will be a series of
1372deletion and insertion mixed together with context lines).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1373<div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1374source of a rename (usually -M only considers a file that disappeared
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1375as the source of a rename), and the number <code>n</code> controls this aspect of
1376the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1377addition and deletion compared to 20% or more of the file&#8217;s size are
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1378eligible for being picked up as a possible source of a rename to
1379another file.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1380</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1381<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1382-M[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1383</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1384<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1385--find-renames[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1386</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1387<dd>
1388<p>
1389 Detect renames.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1390 If <code>n</code> is specified, it is a threshold on the similarity
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1391 index (i.e. amount of addition/deletions compared to the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1392 file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1393 delete/add pair to be a rename if more than 90% of the file
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1394 hasn&#8217;t changed. Without a <code>%</code> sign, the number is to be read as
1395 a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
1396 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
1397 the same as <code>-M5%</code>. To limit detection to exact renames, use
1398 <code>-M100%</code>. The default similarity index is 50%.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1399</p>
1400</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1401<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1402-C[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1403</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1404<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1405--find-copies[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1406</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1407<dd>
1408<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1409 Detect copies as well as renames. See also <code>--find-copies-harder</code>.
1410 If <code>n</code> is specified, it has the same meaning as for <code>-M&lt;n&gt;</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1411</p>
1412</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1413<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1414--find-copies-harder
1415</dt>
1416<dd>
1417<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1418 For performance reasons, by default, <code>-C</code> option finds copies only
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1419 if the original file of the copy was modified in the same
1420 changeset. This flag makes the command
1421 inspect unmodified files as candidates for the source of
1422 copy. This is a very expensive operation for large
Junio C Hamano16f98872007-06-12 16:09:14[diff] [blame]1423 projects, so use it with caution. Giving more than one
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1424 <code>-C</code> option has the same effect.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1425</p>
1426</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1427<dt class="hdlist1">
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]1428-D
1429</dt>
1430<dt class="hdlist1">
1431--irreversible-delete
1432</dt>
1433<dd>
1434<p>
1435 Omit the preimage for deletes, i.e. print only the header but not
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1436 the diff between the preimage and <code>/dev/null</code>. The resulting patch
1437 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]1438 solely for people who want to just concentrate on reviewing the
Junio C Hamanod16fd1b2017-08-04 16:41:51[diff] [blame]1439 text after the change. In addition, the output obviously lacks
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]1440 enough information to apply such a patch in reverse, even manually,
1441 hence the name of the option.
1442</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1443<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]1444of a delete/create pair.</p></div>
1445</dd>
1446<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1447-l&lt;num&gt;
1448</dt>
1449<dd>
1450<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1451 The <code>-M</code> and <code>-C</code> options require O(n^2) processing time where n
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1452 is the number of potential rename/copy targets. This
1453 option prevents rename/copy detection from running if
1454 the number of rename/copy targets exceeds the specified
1455 number.
1456</p>
1457</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1458<dt class="hdlist1">
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1459--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;[*]]
1460</dt>
1461<dd>
1462<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1463 Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
1464 Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
1465 type (i.e. regular file, symlink, submodule, &#8230;) changed (<code>T</code>),
1466 are Unmerged (<code>U</code>), are
1467 Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1468 Any combination of the filter characters (including none) can be used.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1469 When <code>*</code> (All-or-none) is added to the combination, all
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1470 paths are selected if there is any file that matches
1471 other criteria in the comparison; if there is no file
1472 that matches other criteria, nothing is selected.
1473</p>
Junio C Hamanoeed15af2016-07-25 22:49:42[diff] [blame]1474<div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude. E.g.
1475<code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1476</dd>
1477<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1478-S&lt;string&gt;
1479</dt>
1480<dd>
1481<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1482 Look for differences that change the number of occurrences of
1483 the specified string (i.e. addition/deletion) in a file.
1484 Intended for the scripter&#8217;s use.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1485</p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1486<div class="paragraph"><p>It is useful when you&#8217;re looking for an exact block of code (like a
1487struct), and want to know the history of that block since it first
1488came into being: use the feature iteratively to feed the interesting
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1489block 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]1490very first version of the block.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1491</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1492<dt class="hdlist1">
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1493-G&lt;regex&gt;
1494</dt>
1495<dd>
1496<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1497 Look for differences whose patch text contains added/removed
1498 lines that match &lt;regex&gt;.
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1499</p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1500<div class="paragraph"><p>To illustrate the difference between <code>-S&lt;regex&gt; --pickaxe-regex</code> and
1501<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]1502file:</p></div>
1503<div class="listingblock">
1504<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1505<pre><code>+ return !regexec(regexp, two-&gt;ptr, 1, &amp;regmatch, 0);
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1506...
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1507- hit = !regexec(regexp, mf2.ptr, 1, &amp;regmatch, 0);</code></pre>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1508</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1509<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
1510-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1511occurrences of that string did not change).</p></div>
1512<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1513information.</p></div>
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1514</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1515<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1516--pickaxe-all
1517</dt>
1518<dd>
1519<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1520 When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1521 changeset, not just the files that contain the change
1522 in &lt;string&gt;.
1523</p>
1524</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1525<dt class="hdlist1">
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1526--pickaxe-regex
1527</dt>
1528<dd>
1529<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1530 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]1531 expression to match.
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1532</p>
1533</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1534<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1535-O&lt;orderfile&gt;
1536</dt>
1537<dd>
1538<p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1539 Control the order in which files appear in the output.
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]1540 This overrides the <code>diff.orderFile</code> configuration variable
1541 (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]1542 use <code>-O/dev/null</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1543</p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1544<div class="paragraph"><p>The output order is determined by the order of glob patterns in
1545&lt;orderfile&gt;.
1546All files with pathnames that match the first pattern are output
1547first, all files with pathnames that match the second pattern (but not
1548the first) are output next, and so on.
1549All files with pathnames that do not match any pattern are output
1550last, as if there was an implicit match-all pattern at the end of the
1551file.
1552If multiple pathnames have the same rank (they match the same pattern
1553but no earlier patterns), their output order relative to each other is
1554the normal order.</p></div>
1555<div class="paragraph"><p>&lt;orderfile&gt; is parsed as follows:</p></div>
1556<div class="openblock">
1557<div class="content">
1558<div class="ulist"><ul>
1559<li>
1560<p>
1561Blank lines are ignored, so they can be used as separators for
1562 readability.
1563</p>
1564</li>
1565<li>
1566<p>
1567Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1568 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1569 pattern if it starts with a hash.
1570</p>
1571</li>
1572<li>
1573<p>
1574Each other line contains a single pattern.
1575</p>
1576</li>
1577</ul></div>
1578</div></div>
1579<div class="paragraph"><p>Patterns have the same syntax and semantics as patterns used for
1580fnmantch(3) without the FNM_PATHNAME flag, except a pathname also
1581matches a pattern if removing any number of the final pathname
1582components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1583matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1584</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1585<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1586-R
1587</dt>
1588<dd>
1589<p>
1590 Swap two inputs; that is, show differences from index or
1591 on-disk file to tree contents.
1592</p>
1593</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1594<dt class="hdlist1">
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1595--relative[=&lt;path&gt;]
1596</dt>
1597<dd>
1598<p>
1599 When run from a subdirectory of the project, it can be
1600 told to exclude changes outside the directory and show
1601 pathnames relative to it with this option. When you are
1602 not in a subdirectory (e.g. in a bare repository), you
1603 can name which subdirectory to make the output relative
1604 to by giving a &lt;path&gt; as an argument.
1605</p>
1606</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1607<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1608-a
1609</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1610<dt class="hdlist1">
Junio C Hamanoc26f5482006-07-09 09:38:14[diff] [blame]1611--text
1612</dt>
1613<dd>
1614<p>
1615 Treat all files as text.
1616</p>
1617</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1618<dt class="hdlist1">
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1619--ignore-space-at-eol
1620</dt>
1621<dd>
1622<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1623 Ignore changes in whitespace at EOL.
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1624</p>
1625</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1626<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1627-b
1628</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1629<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1630--ignore-space-change
1631</dt>
1632<dd>
1633<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1634 Ignore changes in amount of whitespace. This ignores whitespace
1635 at line end, and considers all other sequences of one or
1636 more whitespace characters to be equivalent.
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1637</p>
1638</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1639<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1640-w
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1641</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1642<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1643--ignore-all-space
1644</dt>
1645<dd>
1646<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1647 Ignore whitespace when comparing lines. This ignores
1648 differences even if one line has whitespace where the other
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1649 line has none.
1650</p>
1651</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1652<dt class="hdlist1">
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]1653--ignore-blank-lines
1654</dt>
1655<dd>
1656<p>
1657 Ignore changes whose lines are all blank.
1658</p>
1659</dd>
1660<dt class="hdlist1">
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]1661--inter-hunk-context=&lt;lines&gt;
1662</dt>
1663<dd>
1664<p>
1665 Show the context between diff hunks, up to the specified number
1666 of lines, thereby fusing hunks that are close to each other.
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1667 Defaults to <code>diff.interHunkContext</code> or 0 if the config option
1668 is unset.
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]1669</p>
1670</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1671<dt class="hdlist1">
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]1672-W
1673</dt>
1674<dt class="hdlist1">
1675--function-context
1676</dt>
1677<dd>
1678<p>
1679 Show whole surrounding functions of changes.
1680</p>
1681</dd>
1682<dt class="hdlist1">
Junio C Hamano48fd2f62007-03-19 02:02:30[diff] [blame]1683--exit-code
1684</dt>
1685<dd>
1686<p>
1687 Make the program exit with codes similar to diff(1).
1688 That is, it exits with 1 if there were differences and
1689 0 means no differences.
1690</p>
1691</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1692<dt class="hdlist1">
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1693--quiet
1694</dt>
1695<dd>
1696<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1697 Disable all output of the program. Implies <code>--exit-code</code>.
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1698</p>
1699</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1700<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1701--ext-diff
1702</dt>
1703<dd>
1704<p>
1705 Allow an external diff helper to be executed. If you set an
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1706 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
1707 to use this option with <a href="git-log.html">git-log(1)</a> and friends.
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1708</p>
1709</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1710<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1711--no-ext-diff
1712</dt>
1713<dd>
1714<p>
1715 Disallow external diff drivers.
1716</p>
1717</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1718<dt class="hdlist1">
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1719--textconv
1720</dt>
1721<dt class="hdlist1">
1722--no-textconv
1723</dt>
1724<dd>
1725<p>
1726 Allow (or disallow) external text conversion filters to be run
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1727 when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1728 details. Because textconv filters are typically a one-way
1729 conversion, the resulting diff is suitable for human
1730 consumption, but cannot be applied. For this reason, textconv
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1731 filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
1732 <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]1733 diff plumbing commands.
1734</p>
1735</dd>
1736<dt class="hdlist1">
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1737--ignore-submodules[=&lt;when&gt;]
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1738</dt>
1739<dd>
1740<p>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1741 Ignore changes to submodules in the diff generation. &lt;when&gt; can be
Junio C Hamanoc7102962013-05-29 23:57:17[diff] [blame]1742 either "none", "untracked", "dirty" or "all", which is the default.
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1743 Using "none" will consider the submodule modified when it either contains
1744 untracked or modified files or its HEAD differs from the commit recorded
1745 in the superproject and can be used to override any settings of the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1746 <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 Hamano7d449522010-07-01 00:08:51[diff] [blame]1747 "untracked" is used submodules are not considered dirty when they only
1748 contain untracked content (but they are still scanned for modified
1749 content). Using "dirty" ignores all changes to the work tree of submodules,
1750 only changes to the commits stored in the superproject are shown (this was
1751 the behavior until 1.7.0). Using "all" hides all changes to submodules.
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1752</p>
1753</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1754<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1755--src-prefix=&lt;prefix&gt;
1756</dt>
1757<dd>
1758<p>
1759 Show the given source prefix instead of "a/".
1760</p>
1761</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1762<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1763--dst-prefix=&lt;prefix&gt;
1764</dt>
1765<dd>
1766<p>
1767 Show the given destination prefix instead of "b/".
1768</p>
1769</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1770<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1771--no-prefix
1772</dt>
1773<dd>
1774<p>
1775 Do not show any source or destination prefix.
1776</p>
1777</dd>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]1778<dt class="hdlist1">
1779--line-prefix=&lt;prefix&gt;
1780</dt>
1781<dd>
1782<p>
1783 Prepend an additional prefix to every line of output.
1784</p>
1785</dd>
Junio C Hamanof7017f12016-10-27 23:31:34[diff] [blame]1786<dt class="hdlist1">
1787--ita-invisible-in-index
1788</dt>
1789<dd>
1790<p>
1791 By default entries added by "git add -N" appear as an existing
1792 empty file in "git diff" and a new file in "git diff --cached".
1793 This option makes the entry appear as a new file in "git diff"
1794 and non-existent in "git diff --cached". This option could be
1795 reverted with <code>--ita-visible-in-index</code>. Both options are
1796 experimental and could be removed in future.
1797</p>
1798</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1799</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1800<div class="paragraph"><p>For more detailed explanation on these common options, see also
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1801<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1802<div class="dlist"><dl>
1803<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1804&lt;tree-ish&gt;
1805</dt>
1806<dd>
1807<p>
1808 The id of a tree object.
1809</p>
1810</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1811<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1812&lt;path&gt;&#8230;
1813</dt>
1814<dd>
1815<p>
1816 If provided, the results are limited to a subset of files
1817 matching one of these prefix strings.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1818 i.e., file matches <code>/^&lt;pattern1&gt;|&lt;pattern2&gt;|.../</code>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1819 Note that this parameter does not provide any wildcard or regexp
1820 features.
1821</p>
1822</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1823<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1824-r
1825</dt>
1826<dd>
1827<p>
1828 recurse into sub-trees
1829</p>
1830</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1831<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1832-t
1833</dt>
1834<dd>
1835<p>
1836 show tree entry itself as well as subtrees. Implies -r.
1837</p>
1838</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1839<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1840--root
1841</dt>
1842<dd>
1843<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1844 When <code>--root</code> is specified the initial commit will be shown as a big
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1845 creation event. This is equivalent to a diff against the NULL tree.
1846</p>
1847</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1848<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1849--stdin
1850</dt>
1851<dd>
1852<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1853 When <code>--stdin</code> is specified, the command does not take
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1854 &lt;tree-ish&gt; arguments from the command line. Instead, it
Junio C Hamano3f2f6e52008-08-21 10:34:22[diff] [blame]1855 reads lines containing either two &lt;tree&gt;, one &lt;commit&gt;, or a
1856 list of &lt;commit&gt; from its standard input. (Use a single space
1857 as separator.)
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1858</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1859<div class="paragraph"><p>When two trees are given, it compares the first tree with the second.
Junio C Hamano3f2f6e52008-08-21 10:34:22[diff] [blame]1860When a single commit is given, it compares the commit with its
1861parents. The remaining commits, when given, are used as if they are
Junio C Hamanob53db3c2008-08-07 00:17:52[diff] [blame]1862parents of the first commit.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1863<div class="paragraph"><p>When comparing two trees, the ID of both trees (separated by a space
Junio C Hamano3f2f6e52008-08-21 10:34:22[diff] [blame]1864and terminated by a newline) is printed before the difference. When
1865comparing commits, the ID of the first (or only) commit, followed by a
1866newline, is printed.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1867<div class="paragraph"><p>The following flags further affect the behavior when comparing
Junio C Hamano3f2f6e52008-08-21 10:34:22[diff] [blame]1868commits (but not trees).</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1869</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1870<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1871-m
1872</dt>
1873<dd>
1874<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1875 By default, <em>git diff-tree --stdin</em> does not show
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1876 differences for merge commits. With this flag, it shows
Junio C Hamanoa8adb1e2006-04-10 23:46:16[diff] [blame]1877 differences to that commit from all of its parents. See
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1878 also <code>-c</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1879</p>
1880</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1881<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1882-s
1883</dt>
1884<dd>
1885<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1886 By default, <em>git diff-tree --stdin</em> shows differences,
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1887 either in machine-readable form (without <code>-p</code>) or in patch
1888 form (with <code>-p</code>). This output can be suppressed. It is
1889 only useful with <code>-v</code> flag.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1890</p>
1891</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1892<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1893-v
1894</dt>
1895<dd>
1896<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1897 This flag causes <em>git diff-tree --stdin</em> to also show
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1898 the commit message before the differences.
1899</p>
1900</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1901<dt class="hdlist1">
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1902--pretty[=&lt;format&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1903</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1904<dt class="hdlist1">
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]1905--format=&lt;format&gt;
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]1906</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1907<dd>
1908<p>
Junio C Hamanoa3770f92007-07-25 08:53:33[diff] [blame]1909 Pretty-print the contents of the commit logs in a given format,
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]1910 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]1911 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em>, <em>format:&lt;string&gt;</em>
1912 and <em>tformat:&lt;string&gt;</em>. When <em>&lt;format&gt;</em> is none of the above,
1913 and has <em>%placeholder</em> in it, it acts as if
1914 <em>--pretty=tformat:&lt;format&gt;</em> were given.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1915</p>
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]1916<div class="paragraph"><p>See the "PRETTY FORMATS" section for some additional details for each
1917format. When <em>=&lt;format&gt;</em> part is omitted, it defaults to <em>medium</em>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1918<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]1919configuration (see <a href="git-config.html">git-config(1)</a>).</p></div>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]1920</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1921<dt class="hdlist1">
Junio C Hamanoee695f22007-06-21 00:35:36[diff] [blame]1922--abbrev-commit
1923</dt>
1924<dd>
1925<p>
1926 Instead of showing the full 40-byte hexadecimal commit object
Junio C Hamano6efe3022009-01-13 16:47:56[diff] [blame]1927 name, show only a partial prefix. Non default number of
Junio C Hamanoee695f22007-06-21 00:35:36[diff] [blame]1928 digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies
1929 diff output, if it is displayed).
1930</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1931<div class="paragraph"><p>This should make "--pretty=oneline" a whole lot more readable for
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1932people using 80-column terminals.</p></div>
Junio C Hamanoee695f22007-06-21 00:35:36[diff] [blame]1933</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1934<dt class="hdlist1">
Junio C Hamanof93530e2011-05-25 23:59:59[diff] [blame]1935--no-abbrev-commit
1936</dt>
1937<dd>
1938<p>
1939 Show the full 40-byte hexadecimal commit object name. This negates
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1940 <code>--abbrev-commit</code> and those options which imply it such as
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]1941 "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.
Junio C Hamanof93530e2011-05-25 23:59:59[diff] [blame]1942</p>
1943</dd>
1944<dt class="hdlist1">
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]1945--oneline
1946</dt>
1947<dd>
1948<p>
1949 This is a shorthand for "--pretty=oneline --abbrev-commit"
1950 used together.
1951</p>
1952</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1953<dt class="hdlist1">
Junio C Hamanoc5bb3b32013-08-05 22:43:36[diff] [blame]1954--encoding=&lt;encoding&gt;
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]1955</dt>
1956<dd>
1957<p>
1958 The commit objects record the encoding used for the log message
1959 in their encoding header; this option can be used to tell the
1960 command to re-code the commit log message in the encoding
1961 preferred by the user. For non plumbing commands this
Junio C Hamano823eebb2015-07-10 22:29:34[diff] [blame]1962 defaults to UTF-8. Note that if an object claims to be encoded
1963 in <code>X</code> and we are outputting in <code>X</code>, we will output the object
1964 verbatim; this means that invalid sequences in the original
1965 commit may be copied to the output.
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]1966</p>
1967</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1968<dt class="hdlist1">
Junio C Hamano5996b672016-04-13 22:01:41[diff] [blame]1969--expand-tabs=&lt;n&gt;
1970</dt>
1971<dt class="hdlist1">
1972--expand-tabs
1973</dt>
1974<dt class="hdlist1">
1975--no-expand-tabs
1976</dt>
1977<dd>
1978<p>
1979 Perform a tab expansion (replace each tab with enough spaces
1980 to fill to the next display column that is multiple of <em>&lt;n&gt;</em>)
1981 in the log message before showing it in the output.
1982 <code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
1983 <code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
1984 which disables tab expansion.
1985</p>
1986<div class="paragraph"><p>By default, tabs are expanded in pretty formats that indent the log
1987message by 4 spaces (i.e. <em>medium</em>, which is the default, <em>full</em>,
1988and <em>fuller</em>).</p></div>
1989</dd>
1990<dt class="hdlist1">
Junio C Hamano4e6ba272016-01-20 23:23:19[diff] [blame]1991--notes[=&lt;treeish&gt;]
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]1992</dt>
1993<dd>
1994<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1995 Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]1996 commit, when showing the commit log message. This is the default
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]1997 for <code>git log</code>, <code>git show</code> and <code>git whatchanged</code> commands when
1998 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]1999 on the command line.
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]2000</p>
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]2001<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]2002<code>core.notesRef</code> and <code>notes.displayRef</code> variables (or corresponding
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2003environment 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]2004<div class="paragraph"><p>With an optional <em>&lt;treeish&gt;</em> argument, use the treeish to find the notes
2005to display. The treeish can specify the full refname when it begins
Junio C Hamano1f7c4a52015-10-14 22:15:51[diff] [blame]2006with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
2007<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]2008<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
2009being displayed. Examples: "--notes=foo" will show only notes from
2010"refs/notes/foo"; "--notes=foo --notes" will show both notes from
2011"refs/notes/foo" and from the default notes ref(s).</p></div>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]2012</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2013<dt class="hdlist1">
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]2014--no-notes
2015</dt>
2016<dd>
2017<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2018 Do not show notes. This negates the above <code>--notes</code> option, by
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]2019 resetting the list of notes refs from which notes are shown.
2020 Options are parsed in the order given on the command line, so e.g.
2021 "--notes --notes=foo --no-notes --notes=bar" will only show notes
2022 from "refs/notes/bar".
2023</p>
2024</dd>
2025<dt class="hdlist1">
Junio C Hamano4e6ba272016-01-20 23:23:19[diff] [blame]2026--show-notes[=&lt;treeish&gt;]
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]2027</dt>
2028<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]2029--[no-]standard-notes
2030</dt>
2031<dd>
2032<p>
Junio C Hamano60033462011-05-03 00:48:43[diff] [blame]2033 These options are deprecated. Use the above --notes/--no-notes
2034 options instead.
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]2035</p>
Junio C Hamano57827fb2010-01-23 03:02:50[diff] [blame]2036</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2037<dt class="hdlist1">
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2038--show-signature
2039</dt>
2040<dd>
2041<p>
2042 Check the validity of a signed commit object by passing the signature
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2043 to <code>gpg --verify</code> and show the output.
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2044</p>
2045</dd>
2046<dt class="hdlist1">
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2047--no-commit-id
2048</dt>
2049<dd>
2050<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2051 <em>git diff-tree</em> outputs a line with the commit ID when
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2052 applicable. This flag suppressed the commit ID output.
2053</p>
2054</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2055<dt class="hdlist1">
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2056-c
2057</dt>
2058<dd>
2059<p>
2060 This flag changes the way a merge commit is displayed
2061 (which means it is useful only when the command is given
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2062 one &lt;tree-ish&gt;, or <code>--stdin</code>). It shows the differences
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2063 from each of the parents to the merge result simultaneously
2064 instead of showing pairwise diff between a parent and the
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2065 result one at a time (which is what the <code>-m</code> option does).
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2066 Furthermore, it lists only files which were modified
2067 from all parents.
2068</p>
2069</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2070<dt class="hdlist1">
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2071--cc
2072</dt>
2073<dd>
2074<p>
2075 This flag changes the way a merge commit patch is displayed,
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2076 in a similar way to the <code>-c</code> option. It implies the <code>-c</code>
2077 and <code>-p</code> options and further compresses the patch output
Junio C Hamanoccc2f762008-07-24 04:03:33[diff] [blame]2078 by omitting uninteresting hunks whose the contents in the parents
2079 have only two variants and the merge result picks one of them
2080 without modification. When all hunks are uninteresting, the commit
2081 itself and the commit log message is not shown, just like in any other
2082 "empty diff" case.
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2083</p>
2084</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2085<dt class="hdlist1">
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2086--always
2087</dt>
2088<dd>
2089<p>
2090 Show the commit itself and the commit log message even
2091 if the diff itself is empty.
2092</p>
2093</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2094</dl></div>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2095</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2096</div>
2097<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2098<h2 id="_pretty_formats">PRETTY FORMATS</h2>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2099<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2100<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]2101is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
2102inserted before the <em>Author:</em> line. This line begins with
2103"Merge: " and the sha1s of ancestral commits are printed,
2104separated by spaces. Note that the listed commits may not
2105necessarily be the list of the <strong>direct</strong> parent commits if you
2106have limited your view of history: for example, if you are
2107only interested in changes related to a certain directory or
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2108file.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2109<div class="paragraph"><p>There are several built-in formats, and you can define
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]2110additional formats by setting a pretty.&lt;name&gt;
2111config option to either another format name, or a
2112<em>format:</em> string, as described below (see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2113<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]2114built-in formats:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2115<div class="ulist"><ul>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2116<li>
2117<p>
2118<em>oneline</em>
2119</p>
2120<div class="literalblock">
2121<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2122<pre><code>&lt;sha1&gt; &lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2123</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2124<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]2125</li>
2126<li>
2127<p>
2128<em>short</em>
2129</p>
2130<div class="literalblock">
2131<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2132<pre><code>commit &lt;sha1&gt;
2133Author: &lt;author&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2134</div></div>
2135<div class="literalblock">
2136<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2137<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2138</div></div>
2139</li>
2140<li>
2141<p>
2142<em>medium</em>
2143</p>
2144<div class="literalblock">
2145<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2146<pre><code>commit &lt;sha1&gt;
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2147Author: &lt;author&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2148Date: &lt;author date&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2149</div></div>
2150<div class="literalblock">
2151<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2152<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2153</div></div>
2154<div class="literalblock">
2155<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2156<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2157</div></div>
2158</li>
2159<li>
2160<p>
2161<em>full</em>
2162</p>
2163<div class="literalblock">
2164<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2165<pre><code>commit &lt;sha1&gt;
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2166Author: &lt;author&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2167Commit: &lt;committer&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2168</div></div>
2169<div class="literalblock">
2170<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2171<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2172</div></div>
2173<div class="literalblock">
2174<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2175<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2176</div></div>
2177</li>
2178<li>
2179<p>
2180<em>fuller</em>
2181</p>
2182<div class="literalblock">
2183<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2184<pre><code>commit &lt;sha1&gt;
Junio C Hamano6a3c8272008-12-19 21:38:18[diff] [blame]2185Author: &lt;author&gt;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2186AuthorDate: &lt;author date&gt;
Junio C Hamano6a3c8272008-12-19 21:38:18[diff] [blame]2187Commit: &lt;committer&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2188CommitDate: &lt;committer date&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2189</div></div>
2190<div class="literalblock">
2191<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2192<pre><code>&lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2193</div></div>
2194<div class="literalblock">
2195<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2196<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2197</div></div>
2198</li>
2199<li>
2200<p>
2201<em>email</em>
2202</p>
2203<div class="literalblock">
2204<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2205<pre><code>From &lt;sha1&gt; &lt;date&gt;
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2206From: &lt;author&gt;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2207Date: &lt;author date&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2208Subject: [PATCH] &lt;title line&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2209</div></div>
2210<div class="literalblock">
2211<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2212<pre><code>&lt;full commit message&gt;</code></pre>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2213</div></div>
2214</li>
2215<li>
2216<p>
2217<em>raw</em>
2218</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2219<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]2220stored in the commit object. Notably, the SHA-1s are
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2221displayed in full, regardless of whether --abbrev or
2222--no-abbrev are used, and <em>parents</em> information show the
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]2223true parent commits, without taking grafts or history
Junio C Hamano85f1fde2015-06-01 20:37:32[diff] [blame]2224simplification into account. Note that this format affects the way
2225commits are displayed, but not the way the diff is shown e.g. with
2226<code>git log --raw</code>. To get full object names in a raw diff format,
2227use <code>--no-abbrev</code>.</p></div>
Junio C Hamanoa340aaa2006-11-23 02:47:33[diff] [blame]2228</li>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2229<li>
2230<p>
Junio C Hamanoe32ec8b2010-06-02 23:32:31[diff] [blame]2231<em>format:&lt;string&gt;</em>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2232</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2233<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]2234you want to show. It works a little bit like printf format,
2235with the notable exception that you get a newline with <em>%n</em>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2236instead of <em>\n</em>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2237<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]2238would show something like this:</p></div>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2239<div class="listingblock">
2240<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2241<pre><code>The author of fe6e0ee was Junio C Hamano, 23 hours ago
2242The 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]2243</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2244<div class="paragraph"><p>The placeholders are:</p></div>
2245<div class="ulist"><ul>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2246<li>
2247<p>
2248<em>%H</em>: commit hash
2249</p>
2250</li>
2251<li>
2252<p>
2253<em>%h</em>: abbreviated commit hash
2254</p>
2255</li>
2256<li>
2257<p>
2258<em>%T</em>: tree hash
2259</p>
2260</li>
2261<li>
2262<p>
2263<em>%t</em>: abbreviated tree hash
2264</p>
2265</li>
2266<li>
2267<p>
2268<em>%P</em>: parent hashes
2269</p>
2270</li>
2271<li>
2272<p>
2273<em>%p</em>: abbreviated parent hashes
2274</p>
2275</li>
2276<li>
2277<p>
2278<em>%an</em>: author name
2279</p>
2280</li>
2281<li>
2282<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2283<em>%aN</em>: author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
2284 or <a href="git-blame.html">git-blame(1)</a>)
Junio C Hamanof5a93622008-07-16 03:23:57[diff] [blame]2285</p>
2286</li>
2287<li>
2288<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2289<em>%ae</em>: author email
2290</p>
2291</li>
2292<li>
2293<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2294<em>%aE</em>: author email (respecting .mailmap, see
2295 <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]2296</p>
2297</li>
2298<li>
2299<p>
Junio C Hamanoa387df32008-08-29 08:56:58[diff] [blame]2300<em>%ad</em>: author date (format respects --date= option)
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2301</p>
2302</li>
2303<li>
2304<p>
2305<em>%aD</em>: author date, RFC2822 style
2306</p>
2307</li>
2308<li>
2309<p>
2310<em>%ar</em>: author date, relative
2311</p>
2312</li>
2313<li>
2314<p>
2315<em>%at</em>: author date, UNIX timestamp
2316</p>
2317</li>
2318<li>
2319<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2320<em>%ai</em>: author date, ISO 8601-like format
2321</p>
2322</li>
2323<li>
2324<p>
2325<em>%aI</em>: author date, strict ISO 8601 format
Junio C Hamano02f130b2007-07-14 08:26:56[diff] [blame]2326</p>
2327</li>
2328<li>
2329<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2330<em>%cn</em>: committer name
2331</p>
2332</li>
2333<li>
2334<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2335<em>%cN</em>: committer name (respecting .mailmap, see
2336 <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]2337</p>
2338</li>
2339<li>
2340<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2341<em>%ce</em>: committer email
2342</p>
2343</li>
2344<li>
2345<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2346<em>%cE</em>: committer email (respecting .mailmap, see
2347 <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]2348</p>
2349</li>
2350<li>
2351<p>
Junio C Hamano53fe0312014-09-09 21:16:17[diff] [blame]2352<em>%cd</em>: committer date (format respects --date= option)
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2353</p>
2354</li>
2355<li>
2356<p>
2357<em>%cD</em>: committer date, RFC2822 style
2358</p>
2359</li>
2360<li>
2361<p>
2362<em>%cr</em>: committer date, relative
2363</p>
2364</li>
2365<li>
2366<p>
2367<em>%ct</em>: committer date, UNIX timestamp
2368</p>
2369</li>
2370<li>
2371<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2372<em>%ci</em>: committer date, ISO 8601-like format
2373</p>
2374</li>
2375<li>
2376<p>
2377<em>%cI</em>: committer date, strict ISO 8601 format
Junio C Hamano02f130b2007-07-14 08:26:56[diff] [blame]2378</p>
2379</li>
2380<li>
2381<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2382<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]2383</p>
2384</li>
2385<li>
2386<p>
Junio C Hamano00b9f1a2014-09-29 23:11:28[diff] [blame]2387<em>%D</em>: ref names without the " (", ")" wrapping.
2388</p>
2389</li>
2390<li>
2391<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2392<em>%e</em>: encoding
2393</p>
2394</li>
2395<li>
2396<p>
2397<em>%s</em>: subject
2398</p>
2399</li>
2400<li>
2401<p>
Junio C Hamano5f9a6f02009-04-06 08:26:56[diff] [blame]2402<em>%f</em>: sanitized subject line, suitable for a filename
2403</p>
2404</li>
2405<li>
2406<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2407<em>%b</em>: body
2408</p>
2409</li>
2410<li>
2411<p>
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]2412<em>%B</em>: raw body (unwrapped subject and body)
2413</p>
2414</li>
2415<li>
2416<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]2417<em>%N</em>: commit notes
2418</p>
2419</li>
2420<li>
2421<p>
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2422<em>%GG</em>: raw verification message from GPG for a signed commit
2423</p>
2424</li>
2425<li>
2426<p>
Junio C Hamano4a401d52016-10-26 22:24:37[diff] [blame]2427<em>%G?</em>: show "G" for a good (valid) signature,
2428 "B" for a bad signature,
2429 "U" for a good signature with unknown validity,
2430 "X" for a good signature that has expired,
2431 "Y" for a good signature made by an expired key,
2432 "R" for a good signature made by a revoked key,
2433 "E" if the signature cannot be checked (e.g. missing key)
2434 and "N" for no signature
Junio C Hamano0acb1ae2012-09-24 21:28:13[diff] [blame]2435</p>
2436</li>
2437<li>
2438<p>
2439<em>%GS</em>: show the name of the signer for a signed commit
2440</p>
2441</li>
2442<li>
2443<p>
Junio C Hamano5e7f1312013-03-21 22:49:01[diff] [blame]2444<em>%GK</em>: show the key used to sign a signed commit
2445</p>
2446</li>
2447<li>
2448<p>
Junio C Hamanoe548d1b2016-08-08 22:26:49[diff] [blame]2449<em>%gD</em>: reflog selector, e.g., <code>refs/stash@{1}</code> or
2450 <code>refs/stash@{2 minutes ago</code>}; the format follows the rules described
2451 for the <code>-g</code> option. The portion before the <code>@</code> is the refname as
2452 given on the command line (so <code>git log -g refs/heads/master</code> would
2453 yield <code>refs/heads/master@{0}</code>).
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2454</p>
2455</li>
2456<li>
2457<p>
Junio C Hamanoe548d1b2016-08-08 22:26:49[diff] [blame]2458<em>%gd</em>: shortened reflog selector; same as <code>%gD</code>, but the refname
2459 portion is shortened for human readability (so <code>refs/heads/master</code>
2460 becomes just <code>master</code>).
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2461</p>
2462</li>
2463<li>
2464<p>
Junio C Hamano962f3a32011-12-22 20:21:44[diff] [blame]2465<em>%gn</em>: reflog identity name
2466</p>
2467</li>
2468<li>
2469<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2470<em>%gN</em>: reflog identity name (respecting .mailmap, see
2471 <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]2472</p>
2473</li>
2474<li>
2475<p>
2476<em>%ge</em>: reflog identity email
2477</p>
2478</li>
2479<li>
2480<p>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2481<em>%gE</em>: reflog identity email (respecting .mailmap, see
2482 <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]2483</p>
2484</li>
2485<li>
2486<p>
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2487<em>%gs</em>: reflog subject
2488</p>
2489</li>
2490<li>
2491<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2492<em>%Cred</em>: switch color to red
2493</p>
2494</li>
2495<li>
2496<p>
2497<em>%Cgreen</em>: switch color to green
2498</p>
2499</li>
2500<li>
2501<p>
2502<em>%Cblue</em>: switch color to blue
2503</p>
2504</li>
2505<li>
2506<p>
2507<em>%Creset</em>: reset color
2508</p>
2509</li>
2510<li>
2511<p>
Junio C Hamanoc0859f72016-10-17 22:22:57[diff] [blame]2512<em>%C(&#8230;)</em>: color specification, as described under Values in the
Junio C Hamano4b2a6c12017-08-22 18:32:37[diff] [blame]2513 "CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>.
2514 By default, colors are shown only when enabled for log output (by
2515 <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting the <code>auto</code>
2516 settings of the former if we are going to a terminal). <code>%C(auto,...)</code>
2517 is accepted as a historical synonym for the default (e.g.,
2518 <code>%C(auto,red)</code>). Specifying <code>%C(always,...) will show the colors
2519 even when color is not otherwise enabled (though consider
2520 just using `--color=always</code> to enable color for the whole output,
2521 including this format and anything else git might color). <code>auto</code>
2522 alone (i.e. <code>%C(auto)</code>) will turn on auto coloring on the next
2523 placeholders until the color is switched again.
Junio C Hamanocc0cb312009-01-22 03:38:50[diff] [blame]2524</p>
2525</li>
2526<li>
2527<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]2528<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]2529</p>
2530</li>
2531<li>
2532<p>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2533<em>%n</em>: newline
2534</p>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]2535</li>
Junio C Hamanob78d2592008-04-09 09:39:08[diff] [blame]2536<li>
2537<p>
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]2538<em>%%</em>: a raw <em>%</em>
2539</p>
2540</li>
2541<li>
2542<p>
Junio C Hamanob78d2592008-04-09 09:39:08[diff] [blame]2543<em>%x00</em>: print a byte from a hex code
2544</p>
2545</li>
Junio C Hamanobf984de2009-11-23 06:11:19[diff] [blame]2546<li>
2547<p>
2548<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]2549 <a href="git-shortlog.html">git-shortlog(1)</a>.
Junio C Hamanobf984de2009-11-23 06:11:19[diff] [blame]2550</p>
2551</li>
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2552<li>
2553<p>
2554<em>%&lt;(&lt;N&gt;[,trunc|ltrunc|mtrunc])</em>: make the next placeholder take at
2555 least N columns, padding spaces on the right if necessary.
2556 Optionally truncate at the beginning (ltrunc), the middle (mtrunc)
2557 or the end (trunc) if the output is longer than N columns.
2558 Note that truncating only works correctly with N &gt;= 2.
2559</p>
2560</li>
2561<li>
2562<p>
2563<em>%&lt;|(&lt;N&gt;)</em>: make the next placeholder take at least until Nth
2564 columns, padding spaces on the right if necessary
2565</p>
2566</li>
2567<li>
2568<p>
2569<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>
2570 respectively, but padding spaces on the left
2571</p>
2572</li>
2573<li>
2574<p>
2575<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>
2576 respectively, except that if the next placeholder takes more spaces
2577 than given and there are spaces on its left, use those spaces
2578</p>
2579</li>
2580<li>
2581<p>
2582<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>
2583 respectively, but padding both sides (i.e. the text is centered)
Junio C Hamano222ed822017-06-02 06:24:06[diff] [blame]2584</p>
2585</li>
2586<li>
2587<p>
2588%(trailers): display the trailers of the body as interpreted by
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]2589 <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. If the <code>:only</code> option is given,
2590 omit non-trailer lines from the trailer block. If the <code>:unfold</code>
2591 option is given, behave as if interpret-trailer&#8217;s <code>--unfold</code> option
2592 was given. E.g., <code>%(trailers:only:unfold)</code> to do both.
Junio C Hamano04e768d2013-04-23 19:19:26[diff] [blame]2593</p>
2594</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2595</ul></div>
Junio C Hamanoa3fd83c2007-03-02 10:34:36[diff] [blame]2596</li>
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2597</ul></div>
2598<div class="admonitionblock">
2599<table><tr>
2600<td class="icon">
2601<div class="title">Note</div>
2602</td>
2603<td class="content">Some placeholders may depend on other options given to the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2604revision traversal engine. For example, the <code>%g*</code> reflog options will
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2605insert an empty string unless we are traversing reflog entries (e.g., by
Junio C Hamano00b9f1a2014-09-29 23:11:28[diff] [blame]2606<code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
2607decoration format if <code>--decorate</code> was not already provided on the command
2608line.</td>
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]2609</tr></table>
2610</div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2611<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]2612is inserted immediately before the expansion if and only if the
2613placeholder expands to a non-empty string.</p></div>
Junio C Hamano535c65c2017-06-24 22:51:58[diff] [blame]2614<div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
2615line-feeds immediately preceding the expansion are deleted if and only if the
Junio C Hamano2bd8a742009-12-01 21:16:59[diff] [blame]2616placeholder expands to an empty string.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2617<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]2618is inserted immediately before the expansion if and only if the
2619placeholder expands to a non-empty string.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2620<div class="ulist"><ul>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2621<li>
2622<p>
2623<em>tformat:</em>
2624</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2625<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]2626provides "terminator" semantics instead of "separator" semantics. In
2627other words, each commit has the message terminator character (usually a
2628newline) appended, rather than a separator placed between entries.
2629This means that the final entry of a single-line format will be properly
2630terminated with a new line, just as the "oneline" format does.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2631For example:</p></div>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2632<div class="listingblock">
2633<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2634<pre><code>$ git log -2 --pretty=format:%h 4da45bef \
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2635 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
26364da45be
26377134973 -- NO NEWLINE
2638
2639$ git log -2 --pretty=tformat:%h 4da45bef \
2640 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
26414da45be
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]26427134973</code></pre>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2643</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2644<div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
2645as 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]2646equivalent:</p></div>
2647<div class="listingblock">
2648<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2649<pre><code>$ git log -2 --pretty=tformat:%h 4da45bef
2650$ git log -2 --pretty=%h 4da45bef</code></pre>
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]2651</div></div>
Junio C Hamano6fb124c2008-06-13 10:04:01[diff] [blame]2652</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2653</ul></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2654</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2655</div>
2656<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2657<h2 id="_limiting_output">Limiting Output</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2658<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2659<div class="paragraph"><p>If you&#8217;re only interested in differences in a subset of files, for
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2660example some architecture-specific files, you might do:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2661<div class="literalblock">
2662<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2663<pre><code>git diff-tree -r &lt;tree-ish&gt; &lt;tree-ish&gt; arch/ia64 include/asm-ia64</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2664</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2665<div class="paragraph"><p>and it will only show you what changed in those two directories.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2666<div class="paragraph"><p>Or if you are searching for what changed in just <code>kernel/sched.c</code>, just do</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2667<div class="literalblock">
2668<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2669<pre><code>git diff-tree -r &lt;tree-ish&gt; &lt;tree-ish&gt; kernel/sched.c</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2670</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2671<div class="paragraph"><p>and it will ignore all differences to other files.</p></div>
2672<div class="paragraph"><p>The pattern is always the prefix, and is matched exactly. There are no
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2673wildcards. Even stricter, it has to match a complete path component.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2674I.e. "foo" does not pick up <code>foobar.h</code>. "foo" does match <code>foo/bar.h</code>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2675so it can be used to name subdirectories.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2676<div class="paragraph"><p>An example of normal usage is:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2677<div class="literalblock">
2678<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2679<pre><code>torvalds@ppc970:~/git&gt; git diff-tree --abbrev 5319e4
2680:100664 100664 ac348b... a01513... git-fsck-objects.c</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2681</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2682<div class="paragraph"><p>which tells you that the last commit changed just one file (it&#8217;s from
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2683this one:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2684<div class="listingblock">
2685<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2686<pre><code>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2687tree 5319e4d609cdd282069cc4dce33c1db559539b03
2688parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
2689author Linus Torvalds &lt;torvalds@ppc970.osdl.org&gt; Sat Apr 9 12:02:30 2005
2690committer Linus Torvalds &lt;torvalds@ppc970.osdl.org&gt; Sat Apr 9 12:02:30 2005
2691
2692Make "git-fsck-objects" print out all the root commits it finds.
2693
2694Once I do the reference tracking, I'll also make it print out all the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2695HEAD commits it finds, which is even more interesting.</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2696</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2697<div class="paragraph"><p>in case you care).</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2698</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2699</div>
2700<div class="sect1">
Junio C Hamano543f8d62009-07-29 08:35:21[diff] [blame]2701<h2 id="_raw_output_format">Raw output format</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2702<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2703<div class="paragraph"><p>The raw output format from "git-diff-index", "git-diff-tree",
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2704"git-diff-files" and "git diff --raw" are very similar.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2705<div class="paragraph"><p>These commands all compare two sets of things; what is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2706compared differs:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2707<div class="dlist"><dl>
2708<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2709git-diff-index &lt;tree-ish&gt;
2710</dt>
2711<dd>
2712<p>
2713 compares the &lt;tree-ish&gt; and the files on the filesystem.
2714</p>
2715</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2716<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2717git-diff-index --cached &lt;tree-ish&gt;
2718</dt>
2719<dd>
2720<p>
2721 compares the &lt;tree-ish&gt; and the index.
2722</p>
2723</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2724<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2725git-diff-tree [-r] &lt;tree-ish-1&gt; &lt;tree-ish-2&gt; [&lt;pattern&gt;&#8230;]
2726</dt>
2727<dd>
2728<p>
2729 compares the trees named by the two arguments.
2730</p>
2731</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2732<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2733git-diff-files [&lt;pattern&gt;&#8230;]
2734</dt>
2735<dd>
2736<p>
2737 compares the index and the files on the filesystem.
2738</p>
2739</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2740</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2741<div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
Junio C Hamano543f8d62009-07-29 08:35:21[diff] [blame]2742what is being compared. After that, all the commands print one output
2743line per changed file.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2744<div class="paragraph"><p>An output line is formatted this way:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2745<div class="listingblock">
2746<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2747<pre><code>in-place edit :100644 100644 bcd1234... 0123456... M file0
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2748copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
2749rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
2750create :000000 100644 0000000... 1234567... A file4
2751delete :100644 000000 1234567... 0000000... D file5
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2752unmerged :000000 000000 0000000... 0000000... U file6</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2753</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2754<div class="paragraph"><p>That is, from the left to the right:</p></div>
2755<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2756<li>
2757<p>
2758a colon.
2759</p>
2760</li>
2761<li>
2762<p>
2763mode for "src"; 000000 if creation or unmerged.
2764</p>
2765</li>
2766<li>
2767<p>
2768a space.
2769</p>
2770</li>
2771<li>
2772<p>
2773mode for "dst"; 000000 if deletion or unmerged.
2774</p>
2775</li>
2776<li>
2777<p>
2778a space.
2779</p>
2780</li>
2781<li>
2782<p>
2783sha1 for "src"; 0{40} if creation or unmerged.
2784</p>
2785</li>
2786<li>
2787<p>
2788a space.
2789</p>
2790</li>
2791<li>
2792<p>
2793sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
2794</p>
2795</li>
2796<li>
2797<p>
2798a space.
2799</p>
2800</li>
2801<li>
2802<p>
2803status, followed by optional "score" number.
2804</p>
2805</li>
2806<li>
2807<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2808a tab or a NUL when <code>-z</code> option is used.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2809</p>
2810</li>
2811<li>
2812<p>
2813path for "src"
2814</p>
2815</li>
2816<li>
2817<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2818a tab or a NUL when <code>-z</code> option is used; only exists for C or R.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2819</p>
2820</li>
2821<li>
2822<p>
2823path for "dst"; only exists for C or R.
2824</p>
2825</li>
2826<li>
2827<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2828an LF or a NUL when <code>-z</code> option is used, to terminate the record.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2829</p>
2830</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2831</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2832<div class="paragraph"><p>Possible status letters are:</p></div>
2833<div class="ulist"><ul>
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]2834<li>
2835<p>
2836A: addition of a file
2837</p>
2838</li>
2839<li>
2840<p>
2841C: copy of a file into a new one
2842</p>
2843</li>
2844<li>
2845<p>
2846D: deletion of a file
2847</p>
2848</li>
2849<li>
2850<p>
2851M: modification of the contents or mode of a file
2852</p>
2853</li>
2854<li>
2855<p>
2856R: renaming of a file
2857</p>
2858</li>
2859<li>
2860<p>
2861T: change in the type of the file
2862</p>
2863</li>
2864<li>
2865<p>
2866U: file is unmerged (you must complete the merge before it can
2867be committed)
2868</p>
2869</li>
2870<li>
2871<p>
2872X: "unknown" change type (most probably a bug, please report it)
2873</p>
2874</li>
2875</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2876<div class="paragraph"><p>Status letters C and R are always followed by a score (denoting the
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]2877percentage of similarity between the source and target of the move or
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]2878copy). Status letter M may be followed by a score (denoting the
2879percentage of dissimilarity) for file rewrites.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2880<div class="paragraph"><p>&lt;sha1&gt; is shown as all 0&#8217;s if a file is new on the filesystem
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2881and it is out of sync with the index.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2882<div class="paragraph"><p>Example:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2883<div class="listingblock">
2884<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2885<pre><code>:100644 100644 5be4a4...... 000000...... M file.c</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2886</div></div>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]2887<div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2888quoted as explained for the configuration variable <code>core.quotePath</code>
2889(see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2890verbatim and the line is terminated by a NUL byte.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2891</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2892</div>
2893<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2894<h2 id="_diff_format_for_merges">diff format for merges</h2>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2895<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2896<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2897can take <code>-c</code> or <code>--cc</code> option
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2898to generate diff output also for merge commits. The output differs
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2899from the format described above in the following way:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2900<div class="olist arabic"><ol class="arabic">
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2901<li>
2902<p>
2903there is a colon for each parent
2904</p>
2905</li>
2906<li>
2907<p>
2908there are more "src" modes and "src" sha1
2909</p>
2910</li>
2911<li>
2912<p>
2913status is concatenated status characters for each parent
2914</p>
2915</li>
2916<li>
2917<p>
2918no optional "score" number
2919</p>
2920</li>
2921<li>
2922<p>
2923single path, only for "dst"
2924</p>
2925</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2926</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2927<div class="paragraph"><p>Example:</p></div>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2928<div class="listingblock">
2929<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2930<pre><code>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</code></pre>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2931</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2932<div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2933all parents.</p></div>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2934</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2935</div>
2936<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2937<h2 id="_generating_patches_with_p">Generating patches with -p</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2938<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2939<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]2940with a <code>-p</code> option, "git diff" without the <code>--raw</code> option, or
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2941"git log" with the "-p" option, they
Junio C Hamano7ae0ab22007-11-03 02:46:46[diff] [blame]2942do not produce the output described above; instead they produce a
2943patch file. You can customize the creation of such patches via the
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]2944<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]2945<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]2946diff format:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2947<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2948<li>
2949<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2950It is preceded with a "git diff" header that looks like this:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2951</p>
2952<div class="literalblock">
2953<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2954<pre><code>diff --git a/file1 b/file2</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2955</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2956<div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2957involved. Especially, even for a creation or a deletion,
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2958<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2959<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2960name of the source file of the rename/copy and the name of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2961the file that rename/copy produces, respectively.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2962</li>
2963<li>
2964<p>
2965It is followed by one or more extended header lines:
2966</p>
2967<div class="literalblock">
2968<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2969<pre><code>old mode &lt;mode&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2970new mode &lt;mode&gt;
2971deleted file mode &lt;mode&gt;
2972new file mode &lt;mode&gt;
2973copy from &lt;path&gt;
2974copy to &lt;path&gt;
2975rename from &lt;path&gt;
2976rename to &lt;path&gt;
2977similarity index &lt;number&gt;
2978dissimilarity index &lt;number&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2979index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2980</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2981<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]2982and file permission bits.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]2983<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]2984<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2985the dissimilarity index is the percentage of changed lines. It
2986is a rounded down integer, followed by a percent sign. The
2987similarity index value of 100% is thus reserved for two equal
2988files, while 100% dissimilarity means that no line from the old
2989file made it into the new one.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2990<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]2991The &lt;mode&gt; is included if the file mode does not change; otherwise,
2992separate lines indicate the old and the new mode.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2993</li>
2994<li>
2995<p>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]2996Pathnames with "unusual" characters are quoted as explained for
2997 the configuration variable <code>core.quotePath</code> (see
2998 <a href="git-config.html">git-config(1)</a>).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2999</p>
3000</li>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3001<li>
3002<p>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3003All the <code>file1</code> files in the output refer to files before the
3004 commit, and all the <code>file2</code> files refer to files after the commit.
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3005 It is incorrect to apply each change to each file sequentially. For
3006 example, this patch will swap a and b:
3007</p>
3008<div class="literalblock">
3009<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3010<pre><code>diff --git a/a b/b
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3011rename from a
3012rename to b
3013diff --git a/b b/a
3014rename from b
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3015rename to a</code></pre>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3016</div></div>
3017</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3018</ol></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3019</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3020</div>
3021<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3022<h2 id="_combined_diff_format">combined diff format</h2>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3023<div class="sectionbody">
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]3024<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]3025produce a <em>combined diff</em> when showing a merge. This is the default
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3026format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]3027<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]3028of these commands to force generation of diffs with individual parents
3029of a merge.</p></div>
3030<div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3031<div class="listingblock">
3032<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3033<pre><code>diff --combined describe.c
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3034index fabadb8,cc95eb0..4866510
3035--- a/describe.c
3036+++ b/describe.c
3037@@@ -98,20 -98,12 +98,20 @@@
3038 return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3039 }
3040
3041- static void describe(char *arg)
3042 -static void describe(struct commit *cmit, int last_one)
3043++static void describe(char *arg, int last_one)
3044 {
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3045 + unsigned char sha1[20];
3046 + struct commit *cmit;
3047 struct commit_list *list;
3048 static int initialized = 0;
3049 struct commit_name *n;
3050
3051 + if (get_sha1(arg, sha1) &lt; 0)
3052 + usage(describe_usage);
3053 + cmit = lookup_commit_reference(sha1);
3054 + if (!cmit)
3055 + usage(describe_usage);
3056 +
3057 if (!initialized) {
3058 initialized = 1;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3059 for_each_ref(get_name);</code></pre>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3060</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3061<div class="olist arabic"><ol class="arabic">
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3062<li>
3063<p>
3064It is preceded with a "git diff" header, that looks like
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]3065 this (when <code>-c</code> option is used):
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3066</p>
3067<div class="literalblock">
3068<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3069<pre><code>diff --combined file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3070</div></div>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]3071<div class="paragraph"><p>or like this (when <code>--cc</code> option is used):</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3072<div class="literalblock">
3073<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3074<pre><code>diff --cc file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3075</div></div>
3076</li>
3077<li>
3078<p>
3079It is followed by one or more extended header lines
3080 (this example shows a merge with two parents):
3081</p>
3082<div class="literalblock">
3083<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3084<pre><code>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3085mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
3086new file mode &lt;mode&gt;
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3087deleted file mode &lt;mode&gt;,&lt;mode&gt;</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3088</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3089<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 Hamanoee1e4282007-02-04 08:32:04[diff] [blame]3090the &lt;mode&gt; is different from the rest. Extended headers with
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3091information about detected contents movement (renames and
3092copying detection) are designed to work with diff of two
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3093&lt;tree-ish&gt; and are not used by combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3094</li>
3095<li>
3096<p>
3097It is followed by two-line from-file/to-file header
3098</p>
3099<div class="literalblock">
3100<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3101<pre><code>--- a/file
3102+++ b/file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3103</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3104<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]3105format, <code>/dev/null</code> is used to signal created or deleted
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3106files.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3107</li>
3108<li>
3109<p>
3110Chunk header format is modified to prevent people from
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3111 accidentally feeding it to <code>patch -p1</code>. Combined diff format
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3112 was created for review of merge commit changes, and was not
3113 meant for apply. The change is similar to the change in the
3114 extended <em>index</em> header:
3115</p>
3116<div class="literalblock">
3117<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3118<pre><code>@@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3119</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3120<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]3121header for combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3122</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3123</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3124<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]3125files 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
3126added to B), or <code>" "</code> (space&#8201;&#8212;&#8201;unchanged) prefix, this format
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3127compares two or more files file1, file2,&#8230; with one file X, and
3128shows how X differs from each of fileN. One column for each of
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3129fileN is prepended to the output line to note how X&#8217;s line is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3130different from it.</p></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3131<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
3132fileN but it does not appear in the result. A <code>+</code> character
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]3133in the column N means that the line appears in the result,
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]3134and fileN does not have that line (in other words, the line was
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3135added, from the point of view of that parent).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3136<div class="paragraph"><p>In the above example output, the function signature was changed
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3137from both files (hence two <code>-</code> removals from both file1 and
3138file2, plus <code>++</code> to mean one line that was added does not appear
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]3139in either file1 or file2). Also eight other lines are the same
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3140from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
3141<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3142merge commit with the merge result (i.e. file1..fileN are the
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3143parents). When shown by <code>git diff-files -c</code>, it compares the
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3144two unresolved merge parents with the working tree file
3145(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3146"their version").</p></div>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]3147</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3148</div>
3149<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3150<h2 id="_other_diff_formats">other diff formats</h2>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3151<div class="sectionbody">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3152<div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
3153copied files. The <code>--stat</code> option adds diffstat(1) graph to the
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3154output. These options can be combined with other options, such as
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3155<code>-p</code>, and are meant for human consumption.</p></div>
3156<div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3157formats the pathnames compactly by combining common prefix and suffix of
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3158the pathnames. For example, a change that moves <code>arch/i386/Makefile</code> to
3159<code>arch/x86/Makefile</code> while modifying 4 lines will be shown like this:</p></div>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3160<div class="listingblock">
3161<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3162<pre><code>arch/{i386 =&gt; x86}/Makefile | 4 +--</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3163</div></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3164<div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
3165for easier machine consumption. An entry in <code>--numstat</code> output looks
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3166like this:</p></div>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3167<div class="listingblock">
3168<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3169<pre><code>1 2 README
31703 1 arch/{i386 =&gt; x86}/Makefile</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3171</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3172<div class="paragraph"><p>That is, from left to right:</p></div>
3173<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3174<li>
3175<p>
3176the number of added lines;
3177</p>
3178</li>
3179<li>
3180<p>
3181a tab;
3182</p>
3183</li>
3184<li>
3185<p>
3186the number of deleted lines;
3187</p>
3188</li>
3189<li>
3190<p>
3191a tab;
3192</p>
3193</li>
3194<li>
3195<p>
3196pathname (possibly with rename/copy information);
3197</p>
3198</li>
3199<li>
3200<p>
3201a newline.
3202</p>
3203</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3204</ol></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3205<div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3206<div class="listingblock">
3207<div class="content">
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3208<pre><code>1 2 README NUL
32093 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3210</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3211<div class="paragraph"><p>That is:</p></div>
3212<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3213<li>
3214<p>
3215the number of added lines;
3216</p>
3217</li>
3218<li>
3219<p>
3220a tab;
3221</p>
3222</li>
3223<li>
3224<p>
3225the number of deleted lines;
3226</p>
3227</li>
3228<li>
3229<p>
3230a tab;
3231</p>
3232</li>
3233<li>
3234<p>
3235a NUL (only exists if renamed/copied);
3236</p>
3237</li>
3238<li>
3239<p>
3240pathname in preimage;
3241</p>
3242</li>
3243<li>
3244<p>
3245a NUL (only exists if renamed/copied);
3246</p>
3247</li>
3248<li>
3249<p>
3250pathname in postimage (only exists if renamed/copied);
3251</p>
3252</li>
3253<li>
3254<p>
3255a NUL.
3256</p>
3257</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3258</ol></div>
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3259<div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3260scripts that read the output to tell if the current record being read is
3261a single-path record or a rename/copy record without reading ahead.
Junio C Hamanoac12f0e2014-09-19 22:32:51[diff] [blame]3262After reading added and deleted lines, reading up to <code>NUL</code> would yield
3263the pathname, but if that is <code>NUL</code>, the record will show two paths.</p></div>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]3264</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3265</div>
3266<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3267<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3268<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3269<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]3270</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]3271</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]3272</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]3273<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3274<div id="footer">
3275<div id="footer-text">
Junio C Hamano7e5712f2017-10-05 05:53:13[diff] [blame]3276Last updated 2016-07-14 06:58:50 JST
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]3277</div>
3278</div>
3279</body>
3280</html>