Google Git
Sign in
chromium / external / gitster / git-htmldocs / eed15affdc439fd40e863849b0a56b93c58690ac / . / git-diff-files.html
blob: 317338076909f41fb7411ee398b9edaf62c202f1 [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 Hamanoc14e6ad2014-10-31 20:25:53[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-files(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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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 Hamanoc14e6ad2014-10-31 20:25:53[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-files(1) Manual Page
738</h1>
739<h2>NAME</h2>
740<div class="sectionbody">
741<p>git-diff-files -
742 Compares files in the working tree and the index
743</p>
744</div>
745</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]746<div id="content">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]747<div class="sect1">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]748<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]749<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]750<div class="verseblock">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]751<pre class="content"><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [&lt;common diff options&gt;] [&lt;path&gt;&#8230;]</pre>
752<div class="attribution">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]753</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]754</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]755</div>
756<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]757<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]758<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]759<div class="paragraph"><p>Compares the files in the working tree and the index. When paths
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]760are specified, compares only those named paths. Otherwise all
761entries in the index are compared. The output format is the
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]762same as for <em>git diff-index</em> and <em>git diff-tree</em>.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]763</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]764</div>
765<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]766<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]767<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]768<div class="dlist"><dl>
769<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]770-p
771</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]772<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]773-u
774</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]775<dt class="hdlist1">
Junio C Hamanoe97d5772010-05-19 08:13:58[diff] [blame]776--patch
777</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]778<dd>
779<p>
Junio C Hamanoff979792007-11-16 10:11:30[diff] [blame]780 Generate patch (see section on generating patches).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]781</p>
782</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]783<dt class="hdlist1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]784-s
785</dt>
786<dt class="hdlist1">
787--no-patch
788</dt>
789<dd>
790<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]791 Suppress diff output. Useful for commands like <code>git show</code> that
792 show the patch by default, or to cancel the effect of <code>--patch</code>.
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]793</p>
794</dd>
795<dt class="hdlist1">
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]796-U&lt;n&gt;
797</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]798<dt class="hdlist1">
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]799--unified=&lt;n&gt;
800</dt>
801<dd>
802<p>
803 Generate diffs with &lt;n&gt; lines of context instead of
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]804 the usual three.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]805 Implies <code>-p</code>.
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]806</p>
807</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]808<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]809--raw
810</dt>
811<dd>
812<p>
Junio C Hamano85f1fde2015-06-01 20:37:32[diff] [blame]813 Generate the diff in raw format.
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]814 This is the default.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]815</p>
816</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]817<dt class="hdlist1">
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]818--patch-with-raw
819</dt>
820<dd>
821<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]822 Synonym for <code>-p --raw</code>.
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]823</p>
824</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]825<dt class="hdlist1">
Junio C Hamano5f888332016-06-13 19:28:31[diff] [blame]826--compaction-heuristic
827</dt>
828<dt class="hdlist1">
829--no-compaction-heuristic
830</dt>
831<dd>
832<p>
833 These are to help debugging and tuning an experimental
834 heuristic (which is off by default) that shifts the hunk
835 boundary in an attempt to make the resulting patch easier
836 to read.
837</p>
838</dd>
839<dt class="hdlist1">
Junio C Hamano5a73f302011-10-14 05:58:34[diff] [blame]840--minimal
841</dt>
842<dd>
843<p>
844 Spend extra time to make sure the smallest possible
845 diff is produced.
846</p>
847</dd>
848<dt class="hdlist1">
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]849--patience
850</dt>
851<dd>
852<p>
853 Generate a diff using the "patience diff" algorithm.
854</p>
855</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]856<dt class="hdlist1">
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]857--histogram
858</dt>
859<dd>
860<p>
861 Generate a diff using the "histogram diff" algorithm.
862</p>
863</dd>
864<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]865--diff-algorithm={patience|minimal|histogram|myers}
866</dt>
867<dd>
868<p>
869 Choose a diff algorithm. The variants are as follows:
870</p>
871<div class="openblock">
872<div class="content">
873<div class="dlist"><dl>
874<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]875<code>default</code>, <code>myers</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]876</dt>
877<dd>
878<p>
879 The basic greedy diff algorithm. Currently, this is the default.
880</p>
881</dd>
882<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]883<code>minimal</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]884</dt>
885<dd>
886<p>
887 Spend extra time to make sure the smallest possible diff is
888 produced.
889</p>
890</dd>
891<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]892<code>patience</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]893</dt>
894<dd>
895<p>
896 Use "patience diff" algorithm when generating patches.
897</p>
898</dd>
899<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]900<code>histogram</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]901</dt>
902<dd>
903<p>
904 This algorithm extends the patience algorithm to "support
905 low-occurrence common elements".
906</p>
907</dd>
908</dl></div>
909</div></div>
910<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a
911non-default value and want to use the default one, then you
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]912have to use <code>--diff-algorithm=default</code> option.</p></div>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]913</dd>
914<dt class="hdlist1">
Junio C Hamano4c4b0122011-06-30 01:19:32[diff] [blame]915--stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]916</dt>
917<dd>
918<p>
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]919 Generate a diffstat. By default, as much space as necessary
920 will be used for the filename part, and the rest for the graph
921 part. Maximum width defaults to terminal width, or 80 columns
Junio C Hamano7f2b3cb2012-06-22 22:42:39[diff] [blame]922 if not connected to a terminal, and can be overridden by
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]923 <code>&lt;width&gt;</code>. The width of the filename part can be limited by
924 giving another width <code>&lt;name-width&gt;</code> after a comma. The width
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]925 of the graph part can be limited by using
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]926 <code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
927 a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
928 (does not affect <code>git format-patch</code>).
929 By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
930 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]931 there are more.
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]932</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]933<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
934<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]935</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]936<dt class="hdlist1">
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]937--numstat
938</dt>
939<dd>
940<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]941 Similar to <code>--stat</code>, but shows number of added and
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]942 deleted lines in decimal notation and pathname without
Junio C Hamanod793de52006-12-26 09:11:43[diff] [blame]943 abbreviation, to make it more machine friendly. For
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]944 binary files, outputs two <code>-</code> instead of saying
945 <code>0 0</code>.
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]946</p>
947</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]948<dt class="hdlist1">
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]949--shortstat
950</dt>
951<dd>
952<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]953 Output only the last line of the <code>--stat</code> format containing total
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]954 number of modified files, as well as number of added and deleted
955 lines.
956</p>
957</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]958<dt class="hdlist1">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]959--dirstat[=&lt;param1,param2,&#8230;&gt;]
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]960</dt>
961<dd>
962<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]963 Output the distribution of relative amount of changes for each
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]964 sub-directory. The behavior of <code>--dirstat</code> can be customized by
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]965 passing it a comma separated list of parameters.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]966 The defaults are controlled by the <code>diff.dirstat</code> configuration
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]967 variable (see <a href="git-config.html">git-config(1)</a>).
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]968 The following parameters are available:
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]969</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]970<div class="openblock">
971<div class="content">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]972<div class="dlist"><dl>
973<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]974<code>changes</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]975</dt>
976<dd>
977<p>
978 Compute the dirstat numbers by counting the lines that have been
979 removed from the source, or added to the destination. This ignores
980 the amount of pure code movements within a file. In other words,
981 rearranging lines in a file is not counted as much as other changes.
982 This is the default behavior when no parameter is given.
983</p>
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]984</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]985<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]986<code>lines</code>
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]987</dt>
988<dd>
989<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]990 Compute the dirstat numbers by doing the regular line-based diff
991 analysis, and summing the removed/added line counts. (For binary
992 files, count 64-byte chunks instead, since binary files have no
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]993 natural concept of lines). This is a more expensive <code>--dirstat</code>
994 behavior than the <code>changes</code> behavior, but it does count rearranged
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]995 lines within a file as much as other changes. The resulting output
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]996 is consistent with what you get from the other <code>--*stat</code> options.
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]997</p>
998</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]999<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1000<code>files</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1001</dt>
1002<dd>
1003<p>
1004 Compute the dirstat numbers by counting the number of files changed.
1005 Each changed file counts equally in the dirstat analysis. This is
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1006 the computationally cheapest <code>--dirstat</code> behavior, since it does
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1007 not have to look at the file contents at all.
1008</p>
1009</dd>
1010<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1011<code>cumulative</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1012</dt>
1013<dd>
1014<p>
1015 Count changes in a child directory for the parent directory as well.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1016 Note that when using <code>cumulative</code>, the sum of the percentages
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1017 reported may exceed 100%. The default (non-cumulative) behavior can
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1018 be specified with the <code>noncumulative</code> parameter.
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1019</p>
1020</dd>
1021<dt class="hdlist1">
1022&lt;limit&gt;
1023</dt>
1024<dd>
1025<p>
1026 An integer parameter specifies a cut-off percent (3% by default).
1027 Directories contributing less than this percentage of the changes
1028 are not shown in the output.
1029</p>
1030</dd>
1031</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1032</div></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1033<div class="paragraph"><p>Example: The following will count changed files, while ignoring
1034directories with less than 10% of the total amount of changed files,
1035and accumulating child directory counts in the parent directories:
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1036<code>--dirstat=files,10,cumulative</code>.</p></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1037</dd>
1038<dt class="hdlist1">
Junio C Hamano6959c6c2006-05-17 10:34:11[diff] [blame]1039--summary
1040</dt>
1041<dd>
1042<p>
1043 Output a condensed summary of extended header information
1044 such as creations, renames and mode changes.
1045</p>
1046</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1047<dt class="hdlist1">
Junio C Hamanod1308c92006-04-16 11:01:09[diff] [blame]1048--patch-with-stat
1049</dt>
1050<dd>
1051<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1052 Synonym for <code>-p --stat</code>.
Junio C Hamanod1308c92006-04-16 11:01:09[diff] [blame]1053</p>
1054</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1055<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1056-z
1057</dt>
1058<dd>
1059<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1060 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]1061 given, do not munge pathnames and use NULs as output field terminators.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1062</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1063<div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1064and backslash characters replaced with <code>\t</code>, <code>\n</code>, <code>\"</code>, and <code>\\</code>,
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1065respectively, and the pathname will be enclosed in double quotes if
1066any of those replacements occurred.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1067</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1068<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1069--name-only
1070</dt>
1071<dd>
1072<p>
1073 Show only names of changed files.
1074</p>
1075</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1076<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1077--name-status
1078</dt>
1079<dd>
1080<p>
Junio C Hamanoa9aee782008-04-23 16:09:20[diff] [blame]1081 Show only names and status of changed files. See the description
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1082 of the <code>--diff-filter</code> option on what the status letters mean.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1083</p>
1084</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1085<dt class="hdlist1">
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1086--submodule[=&lt;format&gt;]
1087</dt>
1088<dd>
1089<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1090 Specify how differences in submodules are shown. When <code>--submodule</code>
1091 or <code>--submodule=log</code> is given, the <em>log</em> format is used. This format lists
1092 the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does.
1093 Omitting the <code>--submodule</code> option or specifying <code>--submodule=short</code>,
Junio C Hamanoe768cc12012-03-16 05:43:05[diff] [blame]1094 uses the <em>short</em> format. This format just shows the names of the commits
Junio C Hamanob4e58b12012-11-26 03:13:06[diff] [blame]1095 at the beginning and end of the range. Can be tweaked via the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1096 <code>diff.submodule</code> configuration variable.
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1097</p>
1098</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1099<dt class="hdlist1">
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]1100--color[=&lt;when&gt;]
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1101</dt>
1102<dd>
1103<p>
1104 Show colored diff.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1105 <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
1106 <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]1107</p>
1108</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1109<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1110--no-color
1111</dt>
1112<dd>
1113<p>
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]1114 Turn off colored diff.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1115 It is the same as <code>--color=never</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1116</p>
1117</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1118<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1119--word-diff[=&lt;mode&gt;]
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1120</dt>
1121<dd>
1122<p>
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1123 Show a word diff, using the &lt;mode&gt; to delimit changed words.
1124 By default, words are delimited by whitespace; see
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1125 <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]1126 must be one of:
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1127</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1128<div class="openblock">
1129<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1130<div class="dlist"><dl>
1131<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1132color
1133</dt>
1134<dd>
1135<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1136 Highlight changed words using only colors. Implies <code>--color</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1137</p>
1138</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1139<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1140plain
1141</dt>
1142<dd>
1143<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1144 Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1145 attempts to escape the delimiters if they appear in the input,
1146 so the output may be ambiguous.
1147</p>
1148</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1149<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1150porcelain
1151</dt>
1152<dd>
1153<p>
1154 Use a special line-based format intended for script
1155 consumption. Added/removed/unchanged runs are printed in the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1156 usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1157 character at the beginning of the line and extending to the
1158 end of the line. Newlines in the input are represented by a
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1159 tilde <code>~</code> on a line of its own.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1160</p>
1161</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1162<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1163none
1164</dt>
1165<dd>
1166<p>
1167 Disable word diff again.
1168</p>
1169</dd>
1170</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1171</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1172<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]1173highlight the changed parts in all modes if enabled.</p></div>
1174</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1175<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1176--word-diff-regex=&lt;regex&gt;
1177</dt>
1178<dd>
1179<p>
1180 Use &lt;regex&gt; to decide what a word is, instead of considering
1181 runs of non-whitespace to be a word. Also implies
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1182 <code>--word-diff</code> unless it was already enabled.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1183</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1184<div class="paragraph"><p>Every non-overlapping match of the
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1185&lt;regex&gt; is considered a word. Anything between these matches is
1186considered whitespace and ignored(!) for the purposes of finding
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1187differences. You may want to append <code>|[^[:space:]]</code> to your regular
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1188expression to make sure that it matches all non-whitespace characters.
1189A match that contains a newline is silently truncated(!) at the
1190newline.</p></div>
Junio C Hamano713eded2015-12-03 00:24:02[diff] [blame]1191<div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1192and, correspondingly, show differences character by character.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1193<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]1194<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]1195overrides any diff driver or configuration setting. Diff drivers
1196override configuration settings.</p></div>
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1197</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1198<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1199--color-words[=&lt;regex&gt;]
1200</dt>
1201<dd>
1202<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1203 Equivalent to <code>--word-diff=color</code> plus (if a regex was
1204 specified) <code>--word-diff-regex=&lt;regex&gt;</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1205</p>
1206</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1207<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1208--no-renames
1209</dt>
1210<dd>
1211<p>
1212 Turn off rename detection, even when the configuration
1213 file gives the default to do so.
1214</p>
1215</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1216<dt class="hdlist1">
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1217--check
1218</dt>
1219<dd>
1220<p>
Junio C Hamano84ea1e42016-04-08 21:53:48[diff] [blame]1221 Warn if changes introduce conflict markers or whitespace errors.
1222 What are considered whitespace errors is controlled by <code>core.whitespace</code>
Junio C Hamano6005bfa2011-06-23 00:51:22[diff] [blame]1223 configuration. By default, trailing whitespaces (including
1224 lines that solely consist of whitespaces) and a space character
1225 that is immediately followed by a tab character inside the
1226 initial indent of the line are considered whitespace errors.
1227 Exits with non-zero status if problems are found. Not compatible
1228 with --exit-code.
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1229</p>
1230</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1231<dt class="hdlist1">
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]1232--ws-error-highlight=&lt;kind&gt;
1233</dt>
1234<dd>
1235<p>
1236 Highlight whitespace errors on lines specified by &lt;kind&gt;
1237 in the color specified by <code>color.diff.whitespace</code>. &lt;kind&gt;
1238 is a comma separated list of <code>old</code>, <code>new</code>, <code>context</code>. When
1239 this option is not given, only whitespace errors in <code>new</code>
1240 lines are highlighted. E.g. <code>--ws-error-highlight=new,old</code>
1241 highlights whitespace errors on both deleted and added lines.
1242 <code>all</code> can be used as a short-hand for <code>old,new,context</code>.
1243</p>
1244</dd>
1245<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1246--full-index
1247</dt>
1248<dd>
1249<p>
Junio C Hamano5cf43ca2008-08-20 09:14:14[diff] [blame]1250 Instead of the first handful of characters, show the full
1251 pre- and post-image blob object names on the "index"
1252 line when generating patch format output.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1253</p>
1254</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1255<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1256--binary
1257</dt>
1258<dd>
1259<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1260 In addition to <code>--full-index</code>, output a binary diff that
1261 can be applied with <code>git-apply</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1262</p>
1263</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1264<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1265--abbrev[=&lt;n&gt;]
1266</dt>
1267<dd>
1268<p>
1269 Instead of showing the full 40-byte hexadecimal object
1270 name in diff-raw format output and diff-tree header
Junio C Hamano6efe3022009-01-13 16:47:56[diff] [blame]1271 lines, show only a partial prefix. This is
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1272 independent of the <code>--full-index</code> option above, which controls
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1273 the diff-patch output format. Non default number of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1274 digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1275</p>
1276</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1277<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1278-B[&lt;n&gt;][/&lt;m&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1279</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1280<dt class="hdlist1">
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1281--break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]
1282</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1283<dd>
1284<p>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1285 Break complete rewrite changes into pairs of delete and
1286 create. This serves two purposes:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1287</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1288<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]1289not as a series of deletion and insertion mixed together with a very
1290few lines that happen to match textually as the context, but as a
1291single deletion of everything old followed by a single insertion of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1292everything new, and the number <code>m</code> controls this aspect of the -B
1293option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1294original should remain in the result for Git to consider it a total
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1295rewrite (i.e. otherwise the resulting patch will be a series of
1296deletion and insertion mixed together with context lines).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1297<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]1298source of a rename (usually -M only considers a file that disappeared
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1299as the source of a rename), and the number <code>n</code> controls this aspect of
1300the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1301addition and deletion compared to 20% or more of the file&#8217;s size are
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1302eligible for being picked up as a possible source of a rename to
1303another file.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1304</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1305<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1306-M[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1307</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1308<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1309--find-renames[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1310</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1311<dd>
1312<p>
1313 Detect renames.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1314 If <code>n</code> is specified, it is a threshold on the similarity
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1315 index (i.e. amount of addition/deletions compared to the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1316 file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1317 delete/add pair to be a rename if more than 90% of the file
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1318 hasn&#8217;t changed. Without a <code>%</code> sign, the number is to be read as
1319 a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
1320 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
1321 the same as <code>-M5%</code>. To limit detection to exact renames, use
1322 <code>-M100%</code>. The default similarity index is 50%.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1323</p>
1324</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1325<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1326-C[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1327</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1328<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1329--find-copies[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1330</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1331<dd>
1332<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1333 Detect copies as well as renames. See also <code>--find-copies-harder</code>.
1334 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]1335</p>
1336</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1337<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1338--find-copies-harder
1339</dt>
1340<dd>
1341<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1342 For performance reasons, by default, <code>-C</code> option finds copies only
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1343 if the original file of the copy was modified in the same
1344 changeset. This flag makes the command
1345 inspect unmodified files as candidates for the source of
1346 copy. This is a very expensive operation for large
Junio C Hamano16f98872007-06-12 16:09:14[diff] [blame]1347 projects, so use it with caution. Giving more than one
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1348 <code>-C</code> option has the same effect.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1349</p>
1350</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1351<dt class="hdlist1">
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]1352-D
1353</dt>
1354<dt class="hdlist1">
1355--irreversible-delete
1356</dt>
1357<dd>
1358<p>
1359 Omit the preimage for deletes, i.e. print only the header but not
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1360 the diff between the preimage and <code>/dev/null</code>. The resulting patch
1361 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]1362 solely for people who want to just concentrate on reviewing the
1363 text after the change. In addition, the output obviously lack
1364 enough information to apply such a patch in reverse, even manually,
1365 hence the name of the option.
1366</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1367<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]1368of a delete/create pair.</p></div>
1369</dd>
1370<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1371-l&lt;num&gt;
1372</dt>
1373<dd>
1374<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1375 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]1376 is the number of potential rename/copy targets. This
1377 option prevents rename/copy detection from running if
1378 the number of rename/copy targets exceeds the specified
1379 number.
1380</p>
1381</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1382<dt class="hdlist1">
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1383--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;[*]]
1384</dt>
1385<dd>
1386<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1387 Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
1388 Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
1389 type (i.e. regular file, symlink, submodule, &#8230;) changed (<code>T</code>),
1390 are Unmerged (<code>U</code>), are
1391 Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1392 Any combination of the filter characters (including none) can be used.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1393 When <code>*</code> (All-or-none) is added to the combination, all
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1394 paths are selected if there is any file that matches
1395 other criteria in the comparison; if there is no file
1396 that matches other criteria, nothing is selected.
1397</p>
Junio C Hamanoeed15af2016-07-25 22:49:42[diff] [blame^]1398<div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude. E.g.
1399<code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1400</dd>
1401<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1402-S&lt;string&gt;
1403</dt>
1404<dd>
1405<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1406 Look for differences that change the number of occurrences of
1407 the specified string (i.e. addition/deletion) in a file.
1408 Intended for the scripter&#8217;s use.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1409</p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1410<div class="paragraph"><p>It is useful when you&#8217;re looking for an exact block of code (like a
1411struct), and want to know the history of that block since it first
1412came into being: use the feature iteratively to feed the interesting
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1413block 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]1414very first version of the block.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1415</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1416<dt class="hdlist1">
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1417-G&lt;regex&gt;
1418</dt>
1419<dd>
1420<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1421 Look for differences whose patch text contains added/removed
1422 lines that match &lt;regex&gt;.
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1423</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1424<div class="paragraph"><p>To illustrate the difference between <code>-S&lt;regex&gt; --pickaxe-regex</code> and
1425<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]1426file:</p></div>
1427<div class="listingblock">
1428<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1429<pre><code>+ return !regexec(regexp, two-&gt;ptr, 1, &amp;regmatch, 0);
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1430...
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1431- hit = !regexec(regexp, mf2.ptr, 1, &amp;regmatch, 0);</code></pre>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1432</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1433<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
1434-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1435occurrences of that string did not change).</p></div>
1436<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1437information.</p></div>
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1438</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1439<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1440--pickaxe-all
1441</dt>
1442<dd>
1443<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1444 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]1445 changeset, not just the files that contain the change
1446 in &lt;string&gt;.
1447</p>
1448</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1449<dt class="hdlist1">
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1450--pickaxe-regex
1451</dt>
1452<dd>
1453<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1454 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]1455 expression to match.
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1456</p>
1457</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1458<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1459-O&lt;orderfile&gt;
1460</dt>
1461<dd>
1462<p>
1463 Output the patch in the order specified in the
1464 &lt;orderfile&gt;, which has one shell glob pattern per line.
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]1465 This overrides the <code>diff.orderFile</code> configuration variable
1466 (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>,
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1467 use <code>-O/dev/null</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1468</p>
1469</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1470<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1471-R
1472</dt>
1473<dd>
1474<p>
1475 Swap two inputs; that is, show differences from index or
1476 on-disk file to tree contents.
1477</p>
1478</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1479<dt class="hdlist1">
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1480--relative[=&lt;path&gt;]
1481</dt>
1482<dd>
1483<p>
1484 When run from a subdirectory of the project, it can be
1485 told to exclude changes outside the directory and show
1486 pathnames relative to it with this option. When you are
1487 not in a subdirectory (e.g. in a bare repository), you
1488 can name which subdirectory to make the output relative
1489 to by giving a &lt;path&gt; as an argument.
1490</p>
1491</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1492<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1493-a
1494</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1495<dt class="hdlist1">
Junio C Hamanoc26f5482006-07-09 09:38:14[diff] [blame]1496--text
1497</dt>
1498<dd>
1499<p>
1500 Treat all files as text.
1501</p>
1502</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1503<dt class="hdlist1">
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1504--ignore-space-at-eol
1505</dt>
1506<dd>
1507<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1508 Ignore changes in whitespace at EOL.
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1509</p>
1510</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1511<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1512-b
1513</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1514<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1515--ignore-space-change
1516</dt>
1517<dd>
1518<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1519 Ignore changes in amount of whitespace. This ignores whitespace
1520 at line end, and considers all other sequences of one or
1521 more whitespace characters to be equivalent.
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1522</p>
1523</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1524<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1525-w
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1526</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1527<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1528--ignore-all-space
1529</dt>
1530<dd>
1531<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1532 Ignore whitespace when comparing lines. This ignores
1533 differences even if one line has whitespace where the other
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1534 line has none.
1535</p>
1536</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1537<dt class="hdlist1">
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]1538--ignore-blank-lines
1539</dt>
1540<dd>
1541<p>
1542 Ignore changes whose lines are all blank.
1543</p>
1544</dd>
1545<dt class="hdlist1">
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]1546--inter-hunk-context=&lt;lines&gt;
1547</dt>
1548<dd>
1549<p>
1550 Show the context between diff hunks, up to the specified number
1551 of lines, thereby fusing hunks that are close to each other.
1552</p>
1553</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1554<dt class="hdlist1">
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]1555-W
1556</dt>
1557<dt class="hdlist1">
1558--function-context
1559</dt>
1560<dd>
1561<p>
1562 Show whole surrounding functions of changes.
1563</p>
1564</dd>
1565<dt class="hdlist1">
Junio C Hamano48fd2f62007-03-19 02:02:30[diff] [blame]1566--exit-code
1567</dt>
1568<dd>
1569<p>
1570 Make the program exit with codes similar to diff(1).
1571 That is, it exits with 1 if there were differences and
1572 0 means no differences.
1573</p>
1574</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1575<dt class="hdlist1">
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1576--quiet
1577</dt>
1578<dd>
1579<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1580 Disable all output of the program. Implies <code>--exit-code</code>.
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1581</p>
1582</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1583<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1584--ext-diff
1585</dt>
1586<dd>
1587<p>
1588 Allow an external diff helper to be executed. If you set an
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1589 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
1590 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]1591</p>
1592</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1593<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1594--no-ext-diff
1595</dt>
1596<dd>
1597<p>
1598 Disallow external diff drivers.
1599</p>
1600</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1601<dt class="hdlist1">
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1602--textconv
1603</dt>
1604<dt class="hdlist1">
1605--no-textconv
1606</dt>
1607<dd>
1608<p>
1609 Allow (or disallow) external text conversion filters to be run
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1610 when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1611 details. Because textconv filters are typically a one-way
1612 conversion, the resulting diff is suitable for human
1613 consumption, but cannot be applied. For this reason, textconv
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1614 filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
1615 <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]1616 diff plumbing commands.
1617</p>
1618</dd>
1619<dt class="hdlist1">
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1620--ignore-submodules[=&lt;when&gt;]
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1621</dt>
1622<dd>
1623<p>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1624 Ignore changes to submodules in the diff generation. &lt;when&gt; can be
Junio C Hamanoc7102962013-05-29 23:57:17[diff] [blame]1625 either "none", "untracked", "dirty" or "all", which is the default.
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1626 Using "none" will consider the submodule modified when it either contains
1627 untracked or modified files or its HEAD differs from the commit recorded
1628 in the superproject and can be used to override any settings of the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1629 <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]1630 "untracked" is used submodules are not considered dirty when they only
1631 contain untracked content (but they are still scanned for modified
1632 content). Using "dirty" ignores all changes to the work tree of submodules,
1633 only changes to the commits stored in the superproject are shown (this was
1634 the behavior until 1.7.0). Using "all" hides all changes to submodules.
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1635</p>
1636</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1637<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1638--src-prefix=&lt;prefix&gt;
1639</dt>
1640<dd>
1641<p>
1642 Show the given source prefix instead of "a/".
1643</p>
1644</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1645<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1646--dst-prefix=&lt;prefix&gt;
1647</dt>
1648<dd>
1649<p>
1650 Show the given destination prefix instead of "b/".
1651</p>
1652</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1653<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1654--no-prefix
1655</dt>
1656<dd>
1657<p>
1658 Do not show any source or destination prefix.
1659</p>
1660</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1661</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1662<div class="paragraph"><p>For more detailed explanation on these common options, see also
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1663<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1664<div class="dlist"><dl>
1665<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]1666-1 --base
1667</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1668<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]1669-2 --ours
1670</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1671<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]1672-3 --theirs
1673</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1674<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]1675-0
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1676</dt>
1677<dd>
1678<p>
1679 Diff against the "base" version, "our branch" or "their
1680 branch" respectively. With these options, diffs for
1681 merged entries are not shown.
1682</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1683<div class="paragraph"><p>The default is to diff against our branch (-2) and the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1684cleanly resolved paths. The option -0 can be given to
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1685omit diff output for unmerged entries and just show "Unmerged".</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1686</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1687<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1688-c
1689</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1690<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1691--cc
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]1692</dt>
1693<dd>
1694<p>
1695 This compares stage 2 (our branch), stage 3 (their
1696 branch) and the working tree file and outputs a combined
1697 diff, similar to the way <em>diff-tree</em> shows a merge
1698 commit with these flags.
1699</p>
1700</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1701<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1702-q
1703</dt>
1704<dd>
1705<p>
Junio C Hamano51c2ab02006-07-09 20:38:54[diff] [blame]1706 Remain silent even on nonexistent files
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1707</p>
1708</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1709</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1710</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1711</div>
1712<div class="sect1">
Junio C Hamano543f8d62009-07-29 08:35:21[diff] [blame]1713<h2 id="_raw_output_format">Raw output format</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1714<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1715<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]1716"git-diff-files" and "git diff --raw" are very similar.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1717<div class="paragraph"><p>These commands all compare two sets of things; what is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1718compared differs:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1719<div class="dlist"><dl>
1720<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1721git-diff-index &lt;tree-ish&gt;
1722</dt>
1723<dd>
1724<p>
1725 compares the &lt;tree-ish&gt; and the files on the filesystem.
1726</p>
1727</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1728<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1729git-diff-index --cached &lt;tree-ish&gt;
1730</dt>
1731<dd>
1732<p>
1733 compares the &lt;tree-ish&gt; and the index.
1734</p>
1735</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1736<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1737git-diff-tree [-r] &lt;tree-ish-1&gt; &lt;tree-ish-2&gt; [&lt;pattern&gt;&#8230;]
1738</dt>
1739<dd>
1740<p>
1741 compares the trees named by the two arguments.
1742</p>
1743</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1744<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1745git-diff-files [&lt;pattern&gt;&#8230;]
1746</dt>
1747<dd>
1748<p>
1749 compares the index and the files on the filesystem.
1750</p>
1751</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1752</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1753<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]1754what is being compared. After that, all the commands print one output
1755line per changed file.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1756<div class="paragraph"><p>An output line is formatted this way:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1757<div class="listingblock">
1758<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1759<pre><code>in-place edit :100644 100644 bcd1234... 0123456... M file0
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1760copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1761rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1762create :000000 100644 0000000... 1234567... A file4
1763delete :100644 000000 1234567... 0000000... D file5
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1764unmerged :000000 000000 0000000... 0000000... U file6</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1765</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1766<div class="paragraph"><p>That is, from the left to the right:</p></div>
1767<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1768<li>
1769<p>
1770a colon.
1771</p>
1772</li>
1773<li>
1774<p>
1775mode for "src"; 000000 if creation or unmerged.
1776</p>
1777</li>
1778<li>
1779<p>
1780a space.
1781</p>
1782</li>
1783<li>
1784<p>
1785mode for "dst"; 000000 if deletion or unmerged.
1786</p>
1787</li>
1788<li>
1789<p>
1790a space.
1791</p>
1792</li>
1793<li>
1794<p>
1795sha1 for "src"; 0{40} if creation or unmerged.
1796</p>
1797</li>
1798<li>
1799<p>
1800a space.
1801</p>
1802</li>
1803<li>
1804<p>
1805sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
1806</p>
1807</li>
1808<li>
1809<p>
1810a space.
1811</p>
1812</li>
1813<li>
1814<p>
1815status, followed by optional "score" number.
1816</p>
1817</li>
1818<li>
1819<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1820a tab or a NUL when <code>-z</code> option is used.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1821</p>
1822</li>
1823<li>
1824<p>
1825path for "src"
1826</p>
1827</li>
1828<li>
1829<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1830a 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]1831</p>
1832</li>
1833<li>
1834<p>
1835path for "dst"; only exists for C or R.
1836</p>
1837</li>
1838<li>
1839<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1840an 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]1841</p>
1842</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1843</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1844<div class="paragraph"><p>Possible status letters are:</p></div>
1845<div class="ulist"><ul>
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]1846<li>
1847<p>
1848A: addition of a file
1849</p>
1850</li>
1851<li>
1852<p>
1853C: copy of a file into a new one
1854</p>
1855</li>
1856<li>
1857<p>
1858D: deletion of a file
1859</p>
1860</li>
1861<li>
1862<p>
1863M: modification of the contents or mode of a file
1864</p>
1865</li>
1866<li>
1867<p>
1868R: renaming of a file
1869</p>
1870</li>
1871<li>
1872<p>
1873T: change in the type of the file
1874</p>
1875</li>
1876<li>
1877<p>
1878U: file is unmerged (you must complete the merge before it can
1879be committed)
1880</p>
1881</li>
1882<li>
1883<p>
1884X: "unknown" change type (most probably a bug, please report it)
1885</p>
1886</li>
1887</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1888<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]1889percentage of similarity between the source and target of the move or
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]1890copy). Status letter M may be followed by a score (denoting the
1891percentage of dissimilarity) for file rewrites.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1892<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]1893and it is out of sync with the index.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1894<div class="paragraph"><p>Example:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1895<div class="listingblock">
1896<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1897<pre><code>:100644 100644 5be4a4...... 000000...... M file.c</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1898</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1899<div class="paragraph"><p>When <code>-z</code> option is not used, TAB, LF, and backslash characters
1900in pathnames are represented as <code>\t</code>, <code>\n</code>, and <code>\\</code>,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1901respectively.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1902</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1903</div>
1904<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1905<h2 id="_diff_format_for_merges">diff format for merges</h2>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]1906<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1907<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1908can take <code>-c</code> or <code>--cc</code> option
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]1909to generate diff output also for merge commits. The output differs
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1910from the format described above in the following way:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1911<div class="olist arabic"><ol class="arabic">
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]1912<li>
1913<p>
1914there is a colon for each parent
1915</p>
1916</li>
1917<li>
1918<p>
1919there are more "src" modes and "src" sha1
1920</p>
1921</li>
1922<li>
1923<p>
1924status is concatenated status characters for each parent
1925</p>
1926</li>
1927<li>
1928<p>
1929no optional "score" number
1930</p>
1931</li>
1932<li>
1933<p>
1934single path, only for "dst"
1935</p>
1936</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1937</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1938<div class="paragraph"><p>Example:</p></div>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]1939<div class="listingblock">
1940<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1941<pre><code>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</code></pre>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]1942</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1943<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]1944all parents.</p></div>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]1945</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1946</div>
1947<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1948<h2 id="_generating_patches_with_p">Generating patches with -p</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1949<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1950<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]1951with a <code>-p</code> option, "git diff" without the <code>--raw</code> option, or
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]1952"git log" with the "-p" option, they
Junio C Hamano7ae0ab22007-11-03 02:46:46[diff] [blame]1953do not produce the output described above; instead they produce a
1954patch file. You can customize the creation of such patches via the
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]1955<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]1956<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]1957diff format:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1958<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1959<li>
1960<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]1961It is preceded with a "git diff" header that looks like this:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1962</p>
1963<div class="literalblock">
1964<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1965<pre><code>diff --git a/file1 b/file2</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1966</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1967<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]1968involved. Especially, even for a creation or a deletion,
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1969<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
1970<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]1971name of the source file of the rename/copy and the name of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1972the file that rename/copy produces, respectively.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1973</li>
1974<li>
1975<p>
1976It is followed by one or more extended header lines:
1977</p>
1978<div class="literalblock">
1979<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1980<pre><code>old mode &lt;mode&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1981new mode &lt;mode&gt;
1982deleted file mode &lt;mode&gt;
1983new file mode &lt;mode&gt;
1984copy from &lt;path&gt;
1985copy to &lt;path&gt;
1986rename from &lt;path&gt;
1987rename to &lt;path&gt;
1988similarity index &lt;number&gt;
1989dissimilarity index &lt;number&gt;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1990index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1991</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1992<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]1993and file permission bits.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1994<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]1995<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]1996the dissimilarity index is the percentage of changed lines. It
1997is a rounded down integer, followed by a percent sign. The
1998similarity index value of 100% is thus reserved for two equal
1999files, while 100% dissimilarity means that no line from the old
2000file made it into the new one.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2001<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]2002The &lt;mode&gt; is included if the file mode does not change; otherwise,
2003separate lines indicate the old and the new mode.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2004</li>
2005<li>
2006<p>
Junio C Hamanoa053d542006-10-27 09:29:13[diff] [blame]2007TAB, LF, double quote and backslash characters in pathnames
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2008 are represented as <code>\t</code>, <code>\n</code>, <code>\"</code> and <code>\\</code>, respectively.
Junio C Hamanoa053d542006-10-27 09:29:13[diff] [blame]2009 If there is need for such substitution then the whole
2010 pathname is put in double quotes.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2011</p>
2012</li>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2013<li>
2014<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2015All the <code>file1</code> files in the output refer to files before the
2016 commit, and all the <code>file2</code> files refer to files after the commit.
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2017 It is incorrect to apply each change to each file sequentially. For
2018 example, this patch will swap a and b:
2019</p>
2020<div class="literalblock">
2021<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2022<pre><code>diff --git a/a b/b
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2023rename from a
2024rename to b
2025diff --git a/b b/a
2026rename from b
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2027rename to a</code></pre>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2028</div></div>
2029</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2030</ol></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2031</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2032</div>
2033<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2034<h2 id="_combined_diff_format">combined diff format</h2>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2035<div class="sectionbody">
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]2036<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]2037produce a <em>combined diff</em> when showing a merge. This is the default
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2038format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]2039<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]2040of these commands to force generation of diffs with individual parents
2041of a merge.</p></div>
2042<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]2043<div class="listingblock">
2044<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2045<pre><code>diff --combined describe.c
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2046index fabadb8,cc95eb0..4866510
2047--- a/describe.c
2048+++ b/describe.c
2049@@@ -98,20 -98,12 +98,20 @@@
2050 return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2051 }
2052
2053- static void describe(char *arg)
2054 -static void describe(struct commit *cmit, int last_one)
2055++static void describe(char *arg, int last_one)
2056 {
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2057 + unsigned char sha1[20];
2058 + struct commit *cmit;
2059 struct commit_list *list;
2060 static int initialized = 0;
2061 struct commit_name *n;
2062
2063 + if (get_sha1(arg, sha1) &lt; 0)
2064 + usage(describe_usage);
2065 + cmit = lookup_commit_reference(sha1);
2066 + if (!cmit)
2067 + usage(describe_usage);
2068 +
2069 if (!initialized) {
2070 initialized = 1;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2071 for_each_ref(get_name);</code></pre>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2072</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2073<div class="olist arabic"><ol class="arabic">
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2074<li>
2075<p>
2076It is preceded with a "git diff" header, that looks like
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2077 this (when <code>-c</code> option is used):
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2078</p>
2079<div class="literalblock">
2080<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2081<pre><code>diff --combined file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2082</div></div>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2083<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]2084<div class="literalblock">
2085<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2086<pre><code>diff --cc file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2087</div></div>
2088</li>
2089<li>
2090<p>
2091It is followed by one or more extended header lines
2092 (this example shows a merge with two parents):
2093</p>
2094<div class="literalblock">
2095<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2096<pre><code>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2097mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
2098new file mode &lt;mode&gt;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2099deleted file mode &lt;mode&gt;,&lt;mode&gt;</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2100</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2101<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]2102the &lt;mode&gt; is different from the rest. Extended headers with
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2103information about detected contents movement (renames and
2104copying detection) are designed to work with diff of two
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2105&lt;tree-ish&gt; and are not used by combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2106</li>
2107<li>
2108<p>
2109It is followed by two-line from-file/to-file header
2110</p>
2111<div class="literalblock">
2112<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2113<pre><code>--- a/file
2114+++ b/file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2115</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2116<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2117format, <code>/dev/null</code> is used to signal created or deleted
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2118files.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2119</li>
2120<li>
2121<p>
2122Chunk header format is modified to prevent people from
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2123 accidentally feeding it to <code>patch -p1</code>. Combined diff format
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2124 was created for review of merge commit changes, and was not
2125 meant for apply. The change is similar to the change in the
2126 extended <em>index</em> header:
2127</p>
2128<div class="literalblock">
2129<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2130<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]2131</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2132<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]2133header for combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2134</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2135</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2136<div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2137files 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
2138added to B), or <code>" "</code> (space&#8201;&#8212;&#8201;unchanged) prefix, this format
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2139compares two or more files file1, file2,&#8230; with one file X, and
2140shows how X differs from each of fileN. One column for each of
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2141fileN is prepended to the output line to note how X&#8217;s line is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2142different from it.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2143<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2144fileN but it does not appear in the result. A <code>+</code> character
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]2145in the column N means that the line appears in the result,
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2146and fileN does not have that line (in other words, the line was
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2147added, from the point of view of that parent).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2148<div class="paragraph"><p>In the above example output, the function signature was changed
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2149from both files (hence two <code>-</code> removals from both file1 and
2150file2, plus <code>++</code> to mean one line that was added does not appear
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]2151in either file1 or file2). Also eight other lines are the same
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2152from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
2153<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]2154merge commit with the merge result (i.e. file1..fileN are the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2155parents). When shown by <code>git diff-files -c</code>, it compares the
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2156two unresolved merge parents with the working tree file
2157(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2158"their version").</p></div>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2159</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2160</div>
2161<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2162<h2 id="_other_diff_formats">other diff formats</h2>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2163<div class="sectionbody">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2164<div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2165copied files. The <code>--stat</code> option adds diffstat(1) graph to the
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2166output. These options can be combined with other options, such as
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2167<code>-p</code>, and are meant for human consumption.</p></div>
2168<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]2169formats the pathnames compactly by combining common prefix and suffix of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2170the pathnames. For example, a change that moves <code>arch/i386/Makefile</code> to
2171<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]2172<div class="listingblock">
2173<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2174<pre><code>arch/{i386 =&gt; x86}/Makefile | 4 +--</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2175</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2176<div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2177for easier machine consumption. An entry in <code>--numstat</code> output looks
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2178like this:</p></div>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2179<div class="listingblock">
2180<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2181<pre><code>1 2 README
21823 1 arch/{i386 =&gt; x86}/Makefile</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2183</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2184<div class="paragraph"><p>That is, from left to right:</p></div>
2185<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2186<li>
2187<p>
2188the number of added lines;
2189</p>
2190</li>
2191<li>
2192<p>
2193a tab;
2194</p>
2195</li>
2196<li>
2197<p>
2198the number of deleted lines;
2199</p>
2200</li>
2201<li>
2202<p>
2203a tab;
2204</p>
2205</li>
2206<li>
2207<p>
2208pathname (possibly with rename/copy information);
2209</p>
2210</li>
2211<li>
2212<p>
2213a newline.
2214</p>
2215</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2216</ol></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2217<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]2218<div class="listingblock">
2219<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2220<pre><code>1 2 README NUL
22213 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2222</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2223<div class="paragraph"><p>That is:</p></div>
2224<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2225<li>
2226<p>
2227the number of added lines;
2228</p>
2229</li>
2230<li>
2231<p>
2232a tab;
2233</p>
2234</li>
2235<li>
2236<p>
2237the number of deleted lines;
2238</p>
2239</li>
2240<li>
2241<p>
2242a tab;
2243</p>
2244</li>
2245<li>
2246<p>
2247a NUL (only exists if renamed/copied);
2248</p>
2249</li>
2250<li>
2251<p>
2252pathname in preimage;
2253</p>
2254</li>
2255<li>
2256<p>
2257a NUL (only exists if renamed/copied);
2258</p>
2259</li>
2260<li>
2261<p>
2262pathname in postimage (only exists if renamed/copied);
2263</p>
2264</li>
2265<li>
2266<p>
2267a NUL.
2268</p>
2269</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2270</ol></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2271<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]2272scripts that read the output to tell if the current record being read is
2273a single-path record or a rename/copy record without reading ahead.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2274After reading added and deleted lines, reading up to <code>NUL</code> would yield
2275the 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]2276</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2277</div>
2278<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2279<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2280<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2281<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]2282</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]2283</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2284</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]2285<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2286<div id="footer">
2287<div id="footer-text">
Junio C Hamano683a8612013-08-23 20:50:09[diff] [blame]2288Last updated 2013-08-20 08:40:27 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2289</div>
2290</div>
2291</body>
2292</html>