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