Google Git
Sign in
chromium / external / gitster / git-htmldocs / 3ef9e6768d632ffc1a3da0561187482e2bd16263 / . / git-diff-files.html
blob: 324c0fd61fd5e8d512b50025f2eff39687753cb2 [file] [log] [blame]
Junio C Hamano96153bf2018-04-25 08:25:34[diff] [blame]1<?xml version="1.0" encoding="UTF-8"?>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
4<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
5<head>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]6<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanoeaa95f72020-04-14 17:39:35[diff] [blame]7<meta name="generator" content="AsciiDoc 9.0.0rc1" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]8<title>git-diff-files(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]9<style type="text/css">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]10/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
11
12/* Default font. */
13body {
14 font-family: Georgia,serif;
15}
16
17/* Title font. */
18h1, h2, h3, h4, h5, h6,
19div.title, caption.title,
20thead, p.table.header,
21#toctitle,
22#author, #revnumber, #revdate, #revremark,
23#footer {
24 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]25}
26
27body {
28 margin: 1em 5% 1em 5%;
29}
30
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]31a {
32 color: blue;
33 text-decoration: underline;
34}
35a:visited {
36 color: fuchsia;
37}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]38
39em {
40 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]41 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]42}
43
44strong {
45 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]46 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]47}
48
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]49h1, h2, h3, h4, h5, h6 {
50 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 margin-top: 1.2em;
52 margin-bottom: 0.5em;
53 line-height: 1.3;
54}
55
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]57 border-bottom: 2px solid silver;
58}
59h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]60 padding-top: 0.5em;
61}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]62h3 {
63 float: left;
64}
65h3 + * {
66 clear: left;
67}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]68h5 {
69 font-size: 1.0em;
70}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]71
72div.sectionbody {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]73 margin-left: 0;
74}
75
76hr {
77 border: 1px solid silver;
78}
79
80p {
81 margin-top: 0.5em;
82 margin-bottom: 0.5em;
83}
84
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]85ul, ol, li > p {
86 margin-top: 0;
87}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]88ul > li { color: #aaa; }
89ul > li > * { color: black; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]90
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]91.monospaced, code, pre {
92 font-family: "Courier New", Courier, monospace;
93 font-size: inherit;
94 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]95 padding: 0;
96 margin: 0;
97}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]98pre {
99 white-space: pre-wrap;
100}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]101
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]102#author {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]103 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]104 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]105 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]106}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]107#email {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]108}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]109#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]110}
111
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]112#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]113 font-size: small;
114 border-top: 2px solid silver;
115 padding-top: 0.5em;
116 margin-top: 4.0em;
117}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]118#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]119 float: left;
120 padding-bottom: 0.5em;
121}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]122#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]123 float: right;
124 padding-bottom: 0.5em;
125}
126
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]127#preamble {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]128 margin-top: 1.5em;
129 margin-bottom: 1.5em;
130}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]131div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]132div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]134 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]135 margin-bottom: 1.5em;
136}
137div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]138 margin-top: 2.0em;
139 margin-bottom: 2.0em;
140 margin-right: 10%;
141 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]142}
143
144div.content { /* Block element content. */
145 padding: 0;
146}
147
148/* Block element titles. */
149div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]150 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]151 font-weight: bold;
152 text-align: left;
153 margin-top: 1.0em;
154 margin-bottom: 0.5em;
155}
156div.title + * {
157 margin-top: 0;
158}
159
160td div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content div.title:first-child {
164 margin-top: 0.0em;
165}
166div.content + div.title {
167 margin-top: 0.0em;
168}
169
170div.sidebarblock > div.content {
171 background: #ffffee;
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]172 border: 1px solid #dddddd;
173 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]174 padding: 0.5em;
175}
176
177div.listingblock > div.content {
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]178 border: 1px solid #dddddd;
179 border-left: 5px solid #f0f0f0;
180 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]181 padding: 0.5em;
182}
183
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]184div.quoteblock, div.verseblock {
185 padding-left: 1.0em;
186 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]187 margin-right: 10%;
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]188 border-left: 5px solid #f0f0f0;
189 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]190}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]191
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]192div.quoteblock > div.attribution {
193 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]194 text-align: right;
195}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]196
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]197div.verseblock > pre.content {
198 font-family: inherit;
199 font-size: inherit;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]200}
201div.verseblock > div.attribution {
202 padding-top: 0.75em;
203 text-align: left;
204}
205/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]206div.verseblock + div.attribution {
207 text-align: left;
208}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]209
210div.admonitionblock .icon {
211 vertical-align: top;
212 font-size: 1.1em;
213 font-weight: bold;
214 text-decoration: underline;
215 color: #527bbd;
216 padding-right: 0.5em;
217}
218div.admonitionblock td.content {
219 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]220 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]221}
222
223div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]224 border-left: 3px solid #dddddd;
225 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]228div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]229span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]230a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]231
232dl {
233 margin-top: 0.8em;
234 margin-bottom: 0.8em;
235}
236dt {
237 margin-top: 0.5em;
238 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]239 font-style: normal;
240 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]241}
242dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]243 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]244}
245
246ul, ol {
247 list-style-position: outside;
248}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]249ol.arabic {
250 list-style-type: decimal;
251}
252ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]253 list-style-type: lower-alpha;
254}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]255ol.upperalpha {
256 list-style-type: upper-alpha;
257}
258ol.lowerroman {
259 list-style-type: lower-roman;
260}
261ol.upperroman {
262 list-style-type: upper-roman;
263}
264
265div.compact ul, div.compact ol,
266div.compact p, div.compact p,
267div.compact div, div.compact div {
268 margin-top: 0.1em;
269 margin-bottom: 0.1em;
270}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]271
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]272tfoot {
273 font-weight: bold;
274}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]275td > div.verse {
276 white-space: pre;
277}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]278
279div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]280 margin-top: 0.8em;
281 margin-bottom: 0.8em;
282}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]283div.hdlist tr {
284 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]285}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]286dt.hdlist1.strong, td.hdlist1.strong {
287 font-weight: bold;
288}
289td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]290 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]291 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]292 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]293 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]294}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]295td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]296 vertical-align: top;
297}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]298div.hdlist.compact tr {
299 margin: 0;
300 padding-bottom: 0;
301}
302
303.comment {
304 background: yellow;
305}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]307.footnote, .footnoteref {
308 font-size: 0.8em;
309}
310
311span.footnote, span.footnoteref {
312 vertical-align: super;
313}
314
315#footnotes {
316 margin: 20px 0 20px 0;
317 padding: 7px 0 0 0;
318}
319
320#footnotes div.footnote {
321 margin: 0 0 5px 0;
322}
323
324#footnotes hr {
325 border: none;
326 border-top: 1px solid silver;
327 height: 1px;
328 text-align: left;
329 margin-left: 0;
330 width: 20%;
331 min-width: 100px;
332}
333
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]334div.colist td {
335 padding-right: 0.5em;
336 padding-bottom: 0.3em;
337 vertical-align: top;
338}
339div.colist td img {
340 margin-top: 0.3em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]341}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]342
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]343@media print {
344 #footer-badges { display: none; }
345}
346
347#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]348 margin-bottom: 2.5em;
349}
350
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]351#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]352 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]353 font-size: 1.1em;
354 font-weight: bold;
355 margin-top: 1.0em;
356 margin-bottom: 0.1em;
357}
358
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]359div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]360 margin-top: 0;
361 margin-bottom: 0;
362}
363div.toclevel2 {
364 margin-left: 2em;
365 font-size: 0.9em;
366}
367div.toclevel3 {
368 margin-left: 4em;
369 font-size: 0.9em;
370}
371div.toclevel4 {
372 margin-left: 6em;
373 font-size: 0.9em;
374}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]375
376span.aqua { color: aqua; }
377span.black { color: black; }
378span.blue { color: blue; }
379span.fuchsia { color: fuchsia; }
380span.gray { color: gray; }
381span.green { color: green; }
382span.lime { color: lime; }
383span.maroon { color: maroon; }
384span.navy { color: navy; }
385span.olive { color: olive; }
386span.purple { color: purple; }
387span.red { color: red; }
388span.silver { color: silver; }
389span.teal { color: teal; }
390span.white { color: white; }
391span.yellow { color: yellow; }
392
393span.aqua-background { background: aqua; }
394span.black-background { background: black; }
395span.blue-background { background: blue; }
396span.fuchsia-background { background: fuchsia; }
397span.gray-background { background: gray; }
398span.green-background { background: green; }
399span.lime-background { background: lime; }
400span.maroon-background { background: maroon; }
401span.navy-background { background: navy; }
402span.olive-background { background: olive; }
403span.purple-background { background: purple; }
404span.red-background { background: red; }
405span.silver-background { background: silver; }
406span.teal-background { background: teal; }
407span.white-background { background: white; }
408span.yellow-background { background: yellow; }
409
410span.big { font-size: 2em; }
411span.small { font-size: 0.6em; }
412
413span.underline { text-decoration: underline; }
414span.overline { text-decoration: overline; }
415span.line-through { text-decoration: line-through; }
416
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]417div.unbreakable { page-break-inside: avoid; }
418
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]419
420/*
421 * xhtml11 specific
422 *
423 * */
424
425div.tableblock {
426 margin-top: 1.0em;
427 margin-bottom: 1.5em;
428}
429div.tableblock > table {
430 border: 3px solid #527bbd;
431}
432thead, p.table.header {
433 font-weight: bold;
434 color: #527bbd;
435}
436p.table {
437 margin-top: 0;
438}
Junio C Hamano725b0da2020-01-22 22:02:40[diff] [blame]439/* Because the table frame attribute is overridden by CSS in most browsers. */
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]440div.tableblock > table[frame="void"] {
441 border-style: none;
442}
443div.tableblock > table[frame="hsides"] {
444 border-left-style: none;
445 border-right-style: none;
446}
447div.tableblock > table[frame="vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
450}
451
452
453/*
454 * html5 specific
455 *
456 * */
457
458table.tableblock {
459 margin-top: 1.0em;
460 margin-bottom: 1.5em;
461}
462thead, p.tableblock.header {
463 font-weight: bold;
464 color: #527bbd;
465}
466p.tableblock {
467 margin-top: 0;
468}
469table.tableblock {
470 border-width: 3px;
471 border-spacing: 0px;
472 border-style: solid;
473 border-color: #527bbd;
474 border-collapse: collapse;
475}
476th.tableblock, td.tableblock {
477 border-width: 1px;
478 padding: 4px;
479 border-style: solid;
480 border-color: #527bbd;
481}
482
483table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
486}
487table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
490}
491table.tableblock.frame-none {
492 border-style: hidden;
493}
494
495th.tableblock.halign-left, td.tableblock.halign-left {
496 text-align: left;
497}
498th.tableblock.halign-center, td.tableblock.halign-center {
499 text-align: center;
500}
501th.tableblock.halign-right, td.tableblock.halign-right {
502 text-align: right;
503}
504
505th.tableblock.valign-top, td.tableblock.valign-top {
506 vertical-align: top;
507}
508th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
510}
511th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
513}
514
515
516/*
517 * manpage specific
518 *
519 * */
520
521body.manpage h1 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]522 padding-top: 0.5em;
523 padding-bottom: 0.5em;
524 border-top: 2px solid silver;
525 border-bottom: 2px solid silver;
526}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]527body.manpage h2 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]528 border-style: none;
529}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]530body.manpage div.sectionbody {
531 margin-left: 3em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]532}
533
534@media print {
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]535 body.manpage div#toc { display: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]536}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]537
538
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]539</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]540<script type="text/javascript">
541/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]542var asciidoc = { // Namespace.
543
544/////////////////////////////////////////////////////////////////////
545// Table Of Contents generator
546/////////////////////////////////////////////////////////////////////
547
548/* Author: Mihai Bazon, September 2002
549 * http://students.infoiasi.ro/~mishoo
550 *
551 * Table Of Content generator
552 * Version: 0.4
553 *
554 * Feel free to use this script under the terms of the GNU General Public
555 * License, as long as you do not remove or alter this notice.
556 */
557
558 /* modified by Troy D. Hanson, September 2006. License: GPL */
559 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
560
561// toclevels = 1..4.
562toc: function (toclevels) {
563
564 function getText(el) {
565 var text = "";
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
568 text += i.data;
569 else if (i.firstChild != null)
570 text += getText(i);
571 }
572 return text;
573 }
574
575 function TocEntry(el, text, toclevel) {
576 this.element = el;
577 this.text = text;
578 this.toclevel = toclevel;
579 }
580
581 function tocEntries(el, toclevels) {
582 var result = new Array;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]583 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]584 // Function that scans the DOM tree for header elements (the DOM2
585 // nodeIterator API would be a better technique but not supported by all
586 // browsers).
587 var iterate = function (el) {
588 for (var i = el.firstChild; i != null; i = i.nextSibling) {
589 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
590 var mo = re.exec(i.tagName);
591 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
592 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
593 }
594 iterate(i);
595 }
596 }
597 }
598 iterate(el);
599 return result;
600 }
601
602 var toc = document.getElementById("toc");
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]603 if (!toc) {
604 return;
605 }
606
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
609 var i;
610 for (i = 0; i < toc.childNodes.length; i++) {
611 var entry = toc.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]612 if (entry.nodeName.toLowerCase() == 'div'
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]613 && entry.getAttribute("class")
614 && entry.getAttribute("class").match(/^toclevel/))
615 tocEntriesToRemove.push(entry);
616 }
617 for (i = 0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
619 }
620
621 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]622 var entries = tocEntries(document.getElementById("content"), toclevels);
623 for (var i = 0; i < entries.length; ++i) {
624 var entry = entries[i];
625 if (entry.element.id == "")
626 entry.element.id = "_toc_" + i;
627 var a = document.createElement("a");
628 a.href = "#" + entry.element.id;
629 a.appendChild(document.createTextNode(entry.text));
630 var div = document.createElement("div");
631 div.appendChild(a);
632 div.className = "toclevel" + entry.toclevel;
633 toc.appendChild(div);
634 }
635 if (entries.length == 0)
636 toc.parentNode.removeChild(toc);
637},
638
639
640/////////////////////////////////////////////////////////////////////
641// Footnotes generator
642/////////////////////////////////////////////////////////////////////
643
644/* Based on footnote generation code from:
645 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
646 */
647
648footnotes: function () {
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]649 // Delete existing footnote entries in case we're reloading the footnodes.
650 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]651 var noteholder = document.getElementById("footnotes");
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]652 if (!noteholder) {
653 return;
654 }
655 var entriesToRemove = [];
656 for (i = 0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]659 entriesToRemove.push(entry);
660 }
661 for (i = 0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
663 }
664
665 // Rebuild footnote entries.
666 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]667 var spans = cont.getElementsByTagName("span");
668 var refs = {};
669 var n = 0;
670 for (i=0; i<spans.length; i++) {
671 if (spans[i].className == "footnote") {
672 n++;
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]673 var note = spans[i].getAttribute("data-note");
674 if (!note) {
675 // Use [\s\S] in place of . so multi-line matches work.
676 // Because JavaScript has no s (dotall) regex flag.
677 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
678 spans[i].innerHTML =
679 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
680 "' title='View footnote' class='footnote'>" + n + "</a>]";
681 spans[i].setAttribute("data-note", note);
682 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n + "'>" +
685 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
686 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]687 var id =spans[i].getAttribute("id");
688 if (id != null) refs["#"+id] = n;
689 }
690 }
691 if (n == 0)
692 noteholder.parentNode.removeChild(noteholder);
693 else {
694 // Process footnoterefs.
695 for (i=0; i<spans.length; i++) {
696 if (spans[i].className == "footnoteref") {
697 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
698 href = href.match(/#.*/)[0]; // Because IE return full URL.
699 n = refs[href];
700 spans[i].innerHTML =
701 "[<a href='#_footnote_" + n +
702 "' title='View footnote' class='footnote'>" + n + "</a>]";
703 }
704 }
705 }
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]706},
707
708install: function(toclevels) {
709 var timerId;
710
711 function reinstall() {
712 asciidoc.footnotes();
713 if (toclevels) {
714 asciidoc.toc(toclevels);
715 }
716 }
717
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
720 reinstall();
721 }
722
723 timerId = setInterval(reinstall, 500);
724 if (document.addEventListener)
725 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
726 else
727 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]728}
729
730}
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]731asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]732/*]]>*/
733</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]734</head>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]735<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]736<div id="header">
737<h1>
738git-diff-files(1) Manual Page
739</h1>
740<h2>NAME</h2>
741<div class="sectionbody">
742<p>git-diff-files -
743 Compares files in the working tree and the index
744</p>
745</div>
746</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]747<div id="content">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]748<div class="sect1">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]749<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]750<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]751<div class="verseblock">
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]752<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>
753<div class="attribution">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]754</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]755</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]756</div>
757<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]758<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]759<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]760<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]761are specified, compares only those named paths. Otherwise all
762entries in the index are compared. The output format is the
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]763same 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]764</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]765</div>
766<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]767<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]768<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]769<div class="dlist"><dl>
770<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]771-p
772</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]773<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]774-u
775</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]776<dt class="hdlist1">
Junio C Hamanoe97d5772010-05-19 08:13:58[diff] [blame]777--patch
778</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]779<dd>
780<p>
Junio C Hamanoff979792007-11-16 10:11:30[diff] [blame]781 Generate patch (see section on generating patches).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]782</p>
783</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]784<dt class="hdlist1">
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]785-s
786</dt>
787<dt class="hdlist1">
788--no-patch
789</dt>
790<dd>
791<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]792 Suppress diff output. Useful for commands like <code>git show</code> that
793 show the patch by default, or to cancel the effect of <code>--patch</code>.
Junio C Hamano58f587a2013-07-22 19:20:59[diff] [blame]794</p>
795</dd>
796<dt class="hdlist1">
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]797-U&lt;n&gt;
798</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]799<dt class="hdlist1">
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]800--unified=&lt;n&gt;
801</dt>
802<dd>
803<p>
804 Generate diffs with &lt;n&gt; lines of context instead of
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]805 the usual three. Implies <code>--patch</code>.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]806 Implies <code>-p</code>.
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]807</p>
808</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]809<dt class="hdlist1">
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]810--output=&lt;file&gt;
811</dt>
812<dd>
813<p>
814 Output to a specific file instead of stdout.
815</p>
816</dd>
817<dt class="hdlist1">
818--output-indicator-new=&lt;char&gt;
819</dt>
820<dt class="hdlist1">
821--output-indicator-old=&lt;char&gt;
822</dt>
823<dt class="hdlist1">
824--output-indicator-context=&lt;char&gt;
825</dt>
826<dd>
827<p>
828 Specify the character used to indicate new, old or context
829 lines in the generated patch. Normally they are <em>+</em>, <em>-</em> and
830 ' ' respectively.
831</p>
832</dd>
833<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]834--raw
835</dt>
836<dd>
837<p>
Junio C Hamano85f1fde2015-06-01 20:37:32[diff] [blame]838 Generate the diff in raw format.
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]839 This is the default.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]840</p>
841</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]842<dt class="hdlist1">
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]843--patch-with-raw
844</dt>
845<dd>
846<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]847 Synonym for <code>-p --raw</code>.
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]848</p>
849</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]850<dt class="hdlist1">
Junio C Hamanoad70bf02016-09-26 23:44:27[diff] [blame]851--indent-heuristic
852</dt>
Junio C Hamanoa65b6762017-11-06 04:45:42[diff] [blame]853<dd>
854<p>
Junio C Hamano14e66832018-06-18 18:32:19[diff] [blame]855 Enable the heuristic that shifts diff hunk boundaries to make patches
Junio C Hamanoa65b6762017-11-06 04:45:42[diff] [blame]856 easier to read. This is the default.
857</p>
858</dd>
Junio C Hamanoad70bf02016-09-26 23:44:27[diff] [blame]859<dt class="hdlist1">
860--no-indent-heuristic
861</dt>
Junio C Hamano5f888332016-06-13 19:28:31[diff] [blame]862<dd>
863<p>
Junio C Hamanoa65b6762017-11-06 04:45:42[diff] [blame]864 Disable the indent heuristic.
Junio C Hamano5f888332016-06-13 19:28:31[diff] [blame]865</p>
866</dd>
867<dt class="hdlist1">
Junio C Hamano5a73f302011-10-14 05:58:34[diff] [blame]868--minimal
869</dt>
870<dd>
871<p>
872 Spend extra time to make sure the smallest possible
873 diff is produced.
874</p>
875</dd>
876<dt class="hdlist1">
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]877--patience
878</dt>
879<dd>
880<p>
881 Generate a diff using the "patience diff" algorithm.
882</p>
883</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]884<dt class="hdlist1">
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]885--histogram
886</dt>
887<dd>
888<p>
889 Generate a diff using the "histogram diff" algorithm.
890</p>
891</dd>
892<dt class="hdlist1">
Junio C Hamano047135e2017-12-19 21:57:54[diff] [blame]893--anchored=&lt;text&gt;
894</dt>
895<dd>
896<p>
897 Generate a diff using the "anchored diff" algorithm.
898</p>
899<div class="paragraph"><p>This option may be specified more than once.</p></div>
900<div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
901and starts with this text, this algorithm attempts to prevent it from
902appearing as a deletion or addition in the output. It uses the "patience
903diff" algorithm internally.</p></div>
904</dd>
905<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]906--diff-algorithm={patience|minimal|histogram|myers}
907</dt>
908<dd>
909<p>
910 Choose a diff algorithm. The variants are as follows:
911</p>
912<div class="openblock">
913<div class="content">
914<div class="dlist"><dl>
915<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]916<code>default</code>, <code>myers</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]917</dt>
918<dd>
919<p>
920 The basic greedy diff algorithm. Currently, this is the default.
921</p>
922</dd>
923<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]924<code>minimal</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]925</dt>
926<dd>
927<p>
928 Spend extra time to make sure the smallest possible diff is
929 produced.
930</p>
931</dd>
932<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]933<code>patience</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]934</dt>
935<dd>
936<p>
937 Use "patience diff" algorithm when generating patches.
938</p>
939</dd>
940<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]941<code>histogram</code>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]942</dt>
943<dd>
944<p>
945 This algorithm extends the patience algorithm to "support
946 low-occurrence common elements".
947</p>
948</dd>
949</dl></div>
950</div></div>
Junio C Hamano14e66832018-06-18 18:32:19[diff] [blame]951<div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]952non-default value and want to use the default one, then you
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]953have to use <code>--diff-algorithm=default</code> option.</p></div>
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]954</dd>
955<dt class="hdlist1">
Junio C Hamano4c4b0122011-06-30 01:19:32[diff] [blame]956--stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]957</dt>
958<dd>
959<p>
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]960 Generate a diffstat. By default, as much space as necessary
961 will be used for the filename part, and the rest for the graph
962 part. Maximum width defaults to terminal width, or 80 columns
Junio C Hamano7f2b3cb2012-06-22 22:42:39[diff] [blame]963 if not connected to a terminal, and can be overridden by
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]964 <code>&lt;width&gt;</code>. The width of the filename part can be limited by
965 giving another width <code>&lt;name-width&gt;</code> after a comma. The width
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]966 of the graph part can be limited by using
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]967 <code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
968 a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
969 (does not affect <code>git format-patch</code>).
970 By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
971 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]972 there are more.
Junio C Hamanoba7c8d82006-04-15 06:17:42[diff] [blame]973</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]974<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
975<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]976</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]977<dt class="hdlist1">
Junio C Hamano45badf02018-03-14 21:56:41[diff] [blame]978--compact-summary
979</dt>
980<dd>
981<p>
982 Output a condensed summary of extended header information such
983 as file creations or deletions ("new" or "gone", optionally "+l"
984 if it&#8217;s a symlink) and mode changes ("+x" or "-x" for adding
985 or removing executable bit respectively) in diffstat. The
Junio C Hamanofa2915c2018-06-19 19:50:18[diff] [blame]986 information is put between the filename part and the graph
Junio C Hamano45badf02018-03-14 21:56:41[diff] [blame]987 part. Implies <code>--stat</code>.
988</p>
989</dd>
990<dt class="hdlist1">
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]991--numstat
992</dt>
993<dd>
994<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]995 Similar to <code>--stat</code>, but shows number of added and
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]996 deleted lines in decimal notation and pathname without
Junio C Hamanod793de52006-12-26 09:11:43[diff] [blame]997 abbreviation, to make it more machine friendly. For
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]998 binary files, outputs two <code>-</code> instead of saying
999 <code>0 0</code>.
Junio C Hamanofbe00522006-10-19 05:58:48[diff] [blame]1000</p>
1001</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1002<dt class="hdlist1">
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]1003--shortstat
1004</dt>
1005<dd>
1006<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1007 Output only the last line of the <code>--stat</code> format containing total
Junio C Hamano7d23f5e2006-12-16 07:44:04[diff] [blame]1008 number of modified files, as well as number of added and deleted
1009 lines.
1010</p>
1011</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1012<dt class="hdlist1">
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]1013-X[&lt;param1,param2,&#8230;&gt;]
1014</dt>
1015<dt class="hdlist1">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1016--dirstat[=&lt;param1,param2,&#8230;&gt;]
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]1017</dt>
1018<dd>
1019<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1020 Output the distribution of relative amount of changes for each
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1021 sub-directory. The behavior of <code>--dirstat</code> can be customized by
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1022 passing it a comma separated list of parameters.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1023 The defaults are controlled by the <code>diff.dirstat</code> configuration
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1024 variable (see <a href="git-config.html">git-config(1)</a>).
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1025 The following parameters are available:
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]1026</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1027<div class="openblock">
1028<div class="content">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1029<div class="dlist"><dl>
1030<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1031<code>changes</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1032</dt>
1033<dd>
1034<p>
1035 Compute the dirstat numbers by counting the lines that have been
1036 removed from the source, or added to the destination. This ignores
1037 the amount of pure code movements within a file. In other words,
1038 rearranging lines in a file is not counted as much as other changes.
1039 This is the default behavior when no parameter is given.
1040</p>
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]1041</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1042<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1043<code>lines</code>
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1044</dt>
1045<dd>
1046<p>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1047 Compute the dirstat numbers by doing the regular line-based diff
1048 analysis, and summing the removed/added line counts. (For binary
1049 files, count 64-byte chunks instead, since binary files have no
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1050 natural concept of lines). This is a more expensive <code>--dirstat</code>
1051 behavior than the <code>changes</code> behavior, but it does count rearranged
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1052 lines within a file as much as other changes. The resulting output
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1053 is consistent with what you get from the other <code>--*stat</code> options.
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1054</p>
1055</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1056<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1057<code>files</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1058</dt>
1059<dd>
1060<p>
1061 Compute the dirstat numbers by counting the number of files changed.
1062 Each changed file counts equally in the dirstat analysis. This is
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1063 the computationally cheapest <code>--dirstat</code> behavior, since it does
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1064 not have to look at the file contents at all.
1065</p>
1066</dd>
1067<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1068<code>cumulative</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1069</dt>
1070<dd>
1071<p>
1072 Count changes in a child directory for the parent directory as well.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1073 Note that when using <code>cumulative</code>, the sum of the percentages
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1074 reported may exceed 100%. The default (non-cumulative) behavior can
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1075 be specified with the <code>noncumulative</code> parameter.
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1076</p>
1077</dd>
1078<dt class="hdlist1">
1079&lt;limit&gt;
1080</dt>
1081<dd>
1082<p>
1083 An integer parameter specifies a cut-off percent (3% by default).
1084 Directories contributing less than this percentage of the changes
1085 are not shown in the output.
1086</p>
1087</dd>
1088</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1089</div></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1090<div class="paragraph"><p>Example: The following will count changed files, while ignoring
1091directories with less than 10% of the total amount of changed files,
1092and accumulating child directory counts in the parent directories:
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1093<code>--dirstat=files,10,cumulative</code>.</p></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]1094</dd>
1095<dt class="hdlist1">
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]1096--cumulative
1097</dt>
1098<dd>
1099<p>
1100 Synonym for --dirstat=cumulative
1101</p>
1102</dd>
1103<dt class="hdlist1">
1104--dirstat-by-file[=&lt;param1,param2&gt;&#8230;]
1105</dt>
1106<dd>
1107<p>
1108 Synonym for --dirstat=files,param1,param2&#8230;
1109</p>
1110</dd>
1111<dt class="hdlist1">
Junio C Hamano6959c6c2006-05-17 10:34:11[diff] [blame]1112--summary
1113</dt>
1114<dd>
1115<p>
1116 Output a condensed summary of extended header information
1117 such as creations, renames and mode changes.
1118</p>
1119</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1120<dt class="hdlist1">
Junio C Hamanod1308c92006-04-16 11:01:09[diff] [blame]1121--patch-with-stat
1122</dt>
1123<dd>
1124<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1125 Synonym for <code>-p --stat</code>.
Junio C Hamanod1308c92006-04-16 11:01:09[diff] [blame]1126</p>
1127</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1128<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1129-z
1130</dt>
1131<dd>
1132<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1133 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]1134 given, do not munge pathnames and use NULs as output field terminators.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1135</p>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]1136<div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1137explained for the configuration variable <code>core.quotePath</code> (see
1138<a href="git-config.html">git-config(1)</a>).</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1139</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1140<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1141--name-only
1142</dt>
1143<dd>
1144<p>
1145 Show only names of changed files.
1146</p>
1147</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1148<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1149--name-status
1150</dt>
1151<dd>
1152<p>
Junio C Hamanoa9aee782008-04-23 16:09:20[diff] [blame]1153 Show only names and status of changed files. See the description
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1154 of the <code>--diff-filter</code> option on what the status letters mean.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1155</p>
1156</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1157<dt class="hdlist1">
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1158--submodule[=&lt;format&gt;]
1159</dt>
1160<dd>
1161<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]1162 Specify how differences in submodules are shown. When specifying
1163 <code>--submodule=short</code> the <em>short</em> format is used. This format just
1164 shows the names of the commits at the beginning and end of the range.
1165 When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em>
1166 format is used. This format lists the commits in the range like
1167 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1168 is specified, the <em>diff</em> format is used. This format shows an
1169 inline diff of the changes in the submodule contents between the
1170 commit range. Defaults to <code>diff.submodule</code> or the <em>short</em> format
1171 if the config option is unset.
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1172</p>
1173</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1174<dt class="hdlist1">
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]1175--color[=&lt;when&gt;]
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1176</dt>
1177<dd>
1178<p>
1179 Show colored diff.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1180 <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
1181 <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]1182</p>
1183</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1184<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1185--no-color
1186</dt>
1187<dd>
1188<p>
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]1189 Turn off colored diff.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1190 It is the same as <code>--color=never</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1191</p>
1192</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1193<dt class="hdlist1">
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1194--color-moved[=&lt;mode&gt;]
1195</dt>
1196<dd>
1197<p>
1198 Moved lines of code are colored differently.
1199 The &lt;mode&gt; defaults to <em>no</em> if the option is not given
1200 and to <em>zebra</em> if the option with no mode is given.
1201 The mode must be one of:
1202</p>
1203<div class="openblock">
1204<div class="content">
1205<div class="dlist"><dl>
1206<dt class="hdlist1">
1207no
1208</dt>
1209<dd>
1210<p>
1211 Moved lines are not highlighted.
1212</p>
1213</dd>
1214<dt class="hdlist1">
1215default
1216</dt>
1217<dd>
1218<p>
1219 Is a synonym for <code>zebra</code>. This may change to a more sensible mode
1220 in the future.
1221</p>
1222</dd>
1223<dt class="hdlist1">
1224plain
1225</dt>
1226<dd>
1227<p>
1228 Any line that is added in one location and was removed
1229 in another location will be colored with <em>color.diff.newMoved</em>.
1230 Similarly <em>color.diff.oldMoved</em> will be used for removed lines
1231 that are added somewhere else in the diff. This mode picks up any
1232 moved line, but it is not very useful in a review to determine
1233 if a block of code was moved without permutation.
1234</p>
1235</dd>
1236<dt class="hdlist1">
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1237blocks
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1238</dt>
1239<dd>
1240<p>
1241 Blocks of moved text of at least 20 alphanumeric characters
1242 are detected greedily. The detected blocks are
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1243 painted using either the <em>color.diff.{old,new}Moved</em> color.
1244 Adjacent blocks cannot be told apart.
1245</p>
1246</dd>
1247<dt class="hdlist1">
1248zebra
1249</dt>
1250<dd>
1251<p>
1252 Blocks of moved text are detected as in <em>blocks</em> mode. The blocks
1253 are painted using either the <em>color.diff.{old,new}Moved</em> color or
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1254 <em>color.diff.{old,new}MovedAlternative</em>. The change between
1255 the two colors indicates that a new block was detected.
1256</p>
1257</dd>
1258<dt class="hdlist1">
Junio C Hamanobfd91f42018-08-17 22:21:16[diff] [blame]1259dimmed-zebra
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1260</dt>
1261<dd>
1262<p>
1263 Similar to <em>zebra</em>, but additional dimming of uninteresting parts
1264 of moved code is performed. The bordering lines of two adjacent
1265 blocks are considered interesting, the rest is uninteresting.
Junio C Hamanobfd91f42018-08-17 22:21:16[diff] [blame]1266 <code>dimmed_zebra</code> is a deprecated synonym.
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1267</p>
1268</dd>
1269</dl></div>
1270</div></div>
1271</dd>
1272<dt class="hdlist1">
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1273--no-color-moved
1274</dt>
1275<dd>
1276<p>
1277 Turn off move detection. This can be used to override configuration
1278 settings. It is the same as <code>--color-moved=no</code>.
1279</p>
1280</dd>
1281<dt class="hdlist1">
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1282--color-moved-ws=&lt;modes&gt;
1283</dt>
1284<dd>
1285<p>
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1286 This configures how whitespace is ignored when performing the
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1287 move detection for <code>--color-moved</code>.
1288 These modes can be given as a comma separated list:
1289</p>
1290<div class="openblock">
1291<div class="content">
1292<div class="dlist"><dl>
1293<dt class="hdlist1">
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1294no
1295</dt>
1296<dd>
1297<p>
1298 Do not ignore whitespace when performing move detection.
1299</p>
1300</dd>
1301<dt class="hdlist1">
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1302ignore-space-at-eol
1303</dt>
1304<dd>
1305<p>
1306 Ignore changes in whitespace at EOL.
1307</p>
1308</dd>
1309<dt class="hdlist1">
1310ignore-space-change
1311</dt>
1312<dd>
1313<p>
1314 Ignore changes in amount of whitespace. This ignores whitespace
1315 at line end, and considers all other sequences of one or
1316 more whitespace characters to be equivalent.
1317</p>
1318</dd>
1319<dt class="hdlist1">
1320ignore-all-space
1321</dt>
1322<dd>
1323<p>
1324 Ignore whitespace when comparing lines. This ignores differences
1325 even if one line has whitespace where the other line has none.
1326</p>
1327</dd>
1328<dt class="hdlist1">
1329allow-indentation-change
1330</dt>
1331<dd>
1332<p>
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1333 Initially ignore any whitespace in the move detection, then
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1334 group the moved code blocks only into a block if the change in
1335 whitespace is the same per line. This is incompatible with the
1336 other modes.
1337</p>
1338</dd>
1339</dl></div>
1340</div></div>
1341</dd>
1342<dt class="hdlist1">
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1343--no-color-moved-ws
1344</dt>
1345<dd>
1346<p>
1347 Do not ignore whitespace when performing move detection. This can be
1348 used to override configuration settings. It is the same as
1349 <code>--color-moved-ws=no</code>.
1350</p>
1351</dd>
1352<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1353--word-diff[=&lt;mode&gt;]
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1354</dt>
1355<dd>
1356<p>
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1357 Show a word diff, using the &lt;mode&gt; to delimit changed words.
1358 By default, words are delimited by whitespace; see
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1359 <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]1360 must be one of:
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1361</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1362<div class="openblock">
1363<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1364<div class="dlist"><dl>
1365<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1366color
1367</dt>
1368<dd>
1369<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1370 Highlight changed words using only colors. Implies <code>--color</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1371</p>
1372</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1373<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1374plain
1375</dt>
1376<dd>
1377<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1378 Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1379 attempts to escape the delimiters if they appear in the input,
1380 so the output may be ambiguous.
1381</p>
1382</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1383<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1384porcelain
1385</dt>
1386<dd>
1387<p>
1388 Use a special line-based format intended for script
1389 consumption. Added/removed/unchanged runs are printed in the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1390 usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1391 character at the beginning of the line and extending to the
1392 end of the line. Newlines in the input are represented by a
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1393 tilde <code>~</code> on a line of its own.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1394</p>
1395</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1396<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1397none
1398</dt>
1399<dd>
1400<p>
1401 Disable word diff again.
1402</p>
1403</dd>
1404</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1405</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1406<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]1407highlight the changed parts in all modes if enabled.</p></div>
1408</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1409<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1410--word-diff-regex=&lt;regex&gt;
1411</dt>
1412<dd>
1413<p>
1414 Use &lt;regex&gt; to decide what a word is, instead of considering
1415 runs of non-whitespace to be a word. Also implies
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1416 <code>--word-diff</code> unless it was already enabled.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1417</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1418<div class="paragraph"><p>Every non-overlapping match of the
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1419&lt;regex&gt; is considered a word. Anything between these matches is
1420considered whitespace and ignored(!) for the purposes of finding
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1421differences. You may want to append <code>|[^[:space:]]</code> to your regular
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1422expression to make sure that it matches all non-whitespace characters.
1423A match that contains a newline is silently truncated(!) at the
1424newline.</p></div>
Junio C Hamano713eded2015-12-03 00:24:02[diff] [blame]1425<div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1426and, correspondingly, show differences character by character.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1427<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]1428<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]1429overrides any diff driver or configuration setting. Diff drivers
1430override configuration settings.</p></div>
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1431</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1432<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1433--color-words[=&lt;regex&gt;]
1434</dt>
1435<dd>
1436<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1437 Equivalent to <code>--word-diff=color</code> plus (if a regex was
1438 specified) <code>--word-diff-regex=&lt;regex&gt;</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1439</p>
1440</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1441<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1442--no-renames
1443</dt>
1444<dd>
1445<p>
1446 Turn off rename detection, even when the configuration
1447 file gives the default to do so.
1448</p>
1449</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1450<dt class="hdlist1">
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]1451--[no-]rename-empty
1452</dt>
1453<dd>
1454<p>
1455 Whether to use empty blobs as rename source.
1456</p>
1457</dd>
1458<dt class="hdlist1">
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1459--check
1460</dt>
1461<dd>
1462<p>
Junio C Hamano84ea1e42016-04-08 21:53:48[diff] [blame]1463 Warn if changes introduce conflict markers or whitespace errors.
1464 What are considered whitespace errors is controlled by <code>core.whitespace</code>
Junio C Hamano6005bfa2011-06-23 00:51:22[diff] [blame]1465 configuration. By default, trailing whitespaces (including
Junio C Hamano14e66832018-06-18 18:32:19[diff] [blame]1466 lines that consist solely of whitespaces) and a space character
Junio C Hamano6005bfa2011-06-23 00:51:22[diff] [blame]1467 that is immediately followed by a tab character inside the
1468 initial indent of the line are considered whitespace errors.
1469 Exits with non-zero status if problems are found. Not compatible
1470 with --exit-code.
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1471</p>
1472</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1473<dt class="hdlist1">
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]1474--ws-error-highlight=&lt;kind&gt;
1475</dt>
1476<dd>
1477<p>
Junio C Hamano4b2a6c12017-08-22 18:32:37[diff] [blame]1478 Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
1479 lines of the diff. Multiple values are separated by comma,
1480 <code>none</code> resets previous values, <code>default</code> reset the list to
1481 <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. When
1482 this option is not given, and the configuration variable
1483 <code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
1484 <code>new</code> lines are highlighted. The whitespace errors are colored
Junio C Hamano14e66832018-06-18 18:32:19[diff] [blame]1485 with <code>color.diff.whitespace</code>.
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]1486</p>
1487</dd>
1488<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1489--full-index
1490</dt>
1491<dd>
1492<p>
Junio C Hamano5cf43ca2008-08-20 09:14:14[diff] [blame]1493 Instead of the first handful of characters, show the full
1494 pre- and post-image blob object names on the "index"
1495 line when generating patch format output.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1496</p>
1497</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1498<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1499--binary
1500</dt>
1501<dd>
1502<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1503 In addition to <code>--full-index</code>, output a binary diff that
Junio C Hamano6b7d2152019-04-16 12:51:15[diff] [blame]1504 can be applied with <code>git-apply</code>. Implies <code>--patch</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1505</p>
1506</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1507<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1508--abbrev[=&lt;n&gt;]
1509</dt>
1510<dd>
1511<p>
1512 Instead of showing the full 40-byte hexadecimal object
1513 name in diff-raw format output and diff-tree header
Junio C Hamano6efe3022009-01-13 16:47:56[diff] [blame]1514 lines, show only a partial prefix. This is
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1515 independent of the <code>--full-index</code> option above, which controls
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1516 the diff-patch output format. Non default number of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1517 digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1518</p>
1519</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1520<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1521-B[&lt;n&gt;][/&lt;m&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1522</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1523<dt class="hdlist1">
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1524--break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]
1525</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1526<dd>
1527<p>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1528 Break complete rewrite changes into pairs of delete and
1529 create. This serves two purposes:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1530</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1531<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]1532not as a series of deletion and insertion mixed together with a very
1533few lines that happen to match textually as the context, but as a
1534single deletion of everything old followed by a single insertion of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1535everything new, and the number <code>m</code> controls this aspect of the -B
1536option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1537original should remain in the result for Git to consider it a total
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1538rewrite (i.e. otherwise the resulting patch will be a series of
1539deletion and insertion mixed together with context lines).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1540<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]1541source of a rename (usually -M only considers a file that disappeared
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1542as the source of a rename), and the number <code>n</code> controls this aspect of
1543the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1544addition and deletion compared to 20% or more of the file&#8217;s size are
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1545eligible for being picked up as a possible source of a rename to
1546another file.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1547</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1548<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1549-M[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1550</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1551<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1552--find-renames[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1553</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1554<dd>
1555<p>
1556 Detect renames.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1557 If <code>n</code> is specified, it is a threshold on the similarity
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1558 index (i.e. amount of addition/deletions compared to the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1559 file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1560 delete/add pair to be a rename if more than 90% of the file
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1561 hasn&#8217;t changed. Without a <code>%</code> sign, the number is to be read as
1562 a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
1563 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
1564 the same as <code>-M5%</code>. To limit detection to exact renames, use
1565 <code>-M100%</code>. The default similarity index is 50%.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1566</p>
1567</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1568<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1569-C[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1570</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1571<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1572--find-copies[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1573</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1574<dd>
1575<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1576 Detect copies as well as renames. See also <code>--find-copies-harder</code>.
1577 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]1578</p>
1579</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1580<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1581--find-copies-harder
1582</dt>
1583<dd>
1584<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1585 For performance reasons, by default, <code>-C</code> option finds copies only
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1586 if the original file of the copy was modified in the same
1587 changeset. This flag makes the command
1588 inspect unmodified files as candidates for the source of
1589 copy. This is a very expensive operation for large
Junio C Hamano16f98872007-06-12 16:09:14[diff] [blame]1590 projects, so use it with caution. Giving more than one
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1591 <code>-C</code> option has the same effect.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1592</p>
1593</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1594<dt class="hdlist1">
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]1595-D
1596</dt>
1597<dt class="hdlist1">
1598--irreversible-delete
1599</dt>
1600<dd>
1601<p>
1602 Omit the preimage for deletes, i.e. print only the header but not
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1603 the diff between the preimage and <code>/dev/null</code>. The resulting patch
1604 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]1605 solely for people who want to just concentrate on reviewing the
Junio C Hamanod16fd1b2017-08-04 16:41:51[diff] [blame]1606 text after the change. In addition, the output obviously lacks
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]1607 enough information to apply such a patch in reverse, even manually,
1608 hence the name of the option.
1609</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1610<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]1611of a delete/create pair.</p></div>
1612</dd>
1613<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1614-l&lt;num&gt;
1615</dt>
1616<dd>
1617<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1618 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]1619 is the number of potential rename/copy targets. This
1620 option prevents rename/copy detection from running if
1621 the number of rename/copy targets exceeds the specified
1622 number.
1623</p>
1624</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1625<dt class="hdlist1">
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1626--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;[*]]
1627</dt>
1628<dd>
1629<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1630 Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
1631 Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
1632 type (i.e. regular file, symlink, submodule, &#8230;) changed (<code>T</code>),
1633 are Unmerged (<code>U</code>), are
1634 Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1635 Any combination of the filter characters (including none) can be used.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1636 When <code>*</code> (All-or-none) is added to the combination, all
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1637 paths are selected if there is any file that matches
1638 other criteria in the comparison; if there is no file
1639 that matches other criteria, nothing is selected.
1640</p>
Junio C Hamanoeed15af2016-07-25 22:49:42[diff] [blame]1641<div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude. E.g.
1642<code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>
Junio C Hamano3a34f152018-01-09 23:09:38[diff] [blame]1643<div class="paragraph"><p>Note that not all diffs can feature all types. For instance, diffs
1644from the index to the working tree can never have Added entries
1645(because the set of paths included in the diff is limited by what is in
1646the index). Similarly, copied and renamed entries cannot appear if
1647detection for those types is disabled.</p></div>
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1648</dd>
1649<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1650-S&lt;string&gt;
1651</dt>
1652<dd>
1653<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1654 Look for differences that change the number of occurrences of
1655 the specified string (i.e. addition/deletion) in a file.
1656 Intended for the scripter&#8217;s use.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1657</p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1658<div class="paragraph"><p>It is useful when you&#8217;re looking for an exact block of code (like a
1659struct), and want to know the history of that block since it first
1660came into being: use the feature iteratively to feed the interesting
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1661block 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]1662very first version of the block.</p></div>
Junio C Hamanoace33e42019-01-18 23:16:05[diff] [blame]1663<div class="paragraph"><p>Binary files are searched as well.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1664</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1665<dt class="hdlist1">
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1666-G&lt;regex&gt;
1667</dt>
1668<dd>
1669<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1670 Look for differences whose patch text contains added/removed
1671 lines that match &lt;regex&gt;.
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1672</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1673<div class="paragraph"><p>To illustrate the difference between <code>-S&lt;regex&gt; --pickaxe-regex</code> and
1674<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]1675file:</p></div>
1676<div class="listingblock">
1677<div class="content">
Junio C Hamanob7e497f2020-02-12 21:41:37[diff] [blame]1678<pre><code>+ return frotz(nitfol, two-&gt;ptr, 1, 0);
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1679...
Junio C Hamanob7e497f2020-02-12 21:41:37[diff] [blame]1680- hit = frotz(nitfol, mf2.ptr, 1, 0);</code></pre>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1681</div></div>
Junio C Hamanob7e497f2020-02-12 21:41:37[diff] [blame]1682<div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1683-S"frotz\(nitfol" --pickaxe-regex</code> will not (because the number of
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1684occurrences of that string did not change).</p></div>
Junio C Hamanoace33e42019-01-18 23:16:05[diff] [blame]1685<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1686filter will be ignored.</p></div>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1687<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1688information.</p></div>
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1689</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1690<dt class="hdlist1">
Junio C Hamano7b9cce92018-01-23 22:34:27[diff] [blame]1691--find-object=&lt;object-id&gt;
1692</dt>
1693<dd>
1694<p>
1695 Look for differences that change the number of occurrences of
1696 the specified object. Similar to <code>-S</code>, just the argument is different
1697 in that it doesn&#8217;t search for a specific string but for a specific
1698 object id.
1699</p>
1700<div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1701<code>git-log</code> to also find trees.</p></div>
1702</dd>
1703<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1704--pickaxe-all
1705</dt>
1706<dd>
1707<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1708 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]1709 changeset, not just the files that contain the change
1710 in &lt;string&gt;.
1711</p>
1712</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1713<dt class="hdlist1">
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1714--pickaxe-regex
1715</dt>
1716<dd>
1717<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1718 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]1719 expression to match.
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1720</p>
1721</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1722<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1723-O&lt;orderfile&gt;
1724</dt>
1725<dd>
1726<p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1727 Control the order in which files appear in the output.
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]1728 This overrides the <code>diff.orderFile</code> configuration variable
1729 (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]1730 use <code>-O/dev/null</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1731</p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1732<div class="paragraph"><p>The output order is determined by the order of glob patterns in
1733&lt;orderfile&gt;.
1734All files with pathnames that match the first pattern are output
1735first, all files with pathnames that match the second pattern (but not
1736the first) are output next, and so on.
1737All files with pathnames that do not match any pattern are output
1738last, as if there was an implicit match-all pattern at the end of the
1739file.
1740If multiple pathnames have the same rank (they match the same pattern
1741but no earlier patterns), their output order relative to each other is
1742the normal order.</p></div>
1743<div class="paragraph"><p>&lt;orderfile&gt; is parsed as follows:</p></div>
1744<div class="openblock">
1745<div class="content">
1746<div class="ulist"><ul>
1747<li>
1748<p>
1749Blank lines are ignored, so they can be used as separators for
1750 readability.
1751</p>
1752</li>
1753<li>
1754<p>
1755Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1756 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1757 pattern if it starts with a hash.
1758</p>
1759</li>
1760<li>
1761<p>
1762Each other line contains a single pattern.
1763</p>
1764</li>
1765</ul></div>
1766</div></div>
1767<div class="paragraph"><p>Patterns have the same syntax and semantics as patterns used for
Junio C Hamano96153bf2018-04-25 08:25:34[diff] [blame]1768fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1769matches a pattern if removing any number of the final pathname
1770components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1771matches "<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]1772</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1773<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1774-R
1775</dt>
1776<dd>
1777<p>
1778 Swap two inputs; that is, show differences from index or
1779 on-disk file to tree contents.
1780</p>
1781</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1782<dt class="hdlist1">
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1783--relative[=&lt;path&gt;]
1784</dt>
Junio C Hamano3ef9e672020-06-02 21:51:31[diff] [blame^]1785<dt class="hdlist1">
1786--no-relative
1787</dt>
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1788<dd>
1789<p>
1790 When run from a subdirectory of the project, it can be
1791 told to exclude changes outside the directory and show
1792 pathnames relative to it with this option. When you are
1793 not in a subdirectory (e.g. in a bare repository), you
1794 can name which subdirectory to make the output relative
1795 to by giving a &lt;path&gt; as an argument.
Junio C Hamano3ef9e672020-06-02 21:51:31[diff] [blame^]1796 <code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config
1797 option and previous <code>--relative</code>.
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1798</p>
1799</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1800<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1801-a
1802</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1803<dt class="hdlist1">
Junio C Hamanoc26f5482006-07-09 09:38:14[diff] [blame]1804--text
1805</dt>
1806<dd>
1807<p>
1808 Treat all files as text.
1809</p>
1810</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1811<dt class="hdlist1">
Junio C Hamano4886c772017-11-27 03:33:28[diff] [blame]1812--ignore-cr-at-eol
1813</dt>
1814<dd>
1815<p>
Junio C Hamano96153bf2018-04-25 08:25:34[diff] [blame]1816 Ignore carriage-return at the end of line when doing a comparison.
Junio C Hamano4886c772017-11-27 03:33:28[diff] [blame]1817</p>
1818</dd>
1819<dt class="hdlist1">
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1820--ignore-space-at-eol
1821</dt>
1822<dd>
1823<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1824 Ignore changes in whitespace at EOL.
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1825</p>
1826</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1827<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1828-b
1829</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1830<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1831--ignore-space-change
1832</dt>
1833<dd>
1834<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1835 Ignore changes in amount of whitespace. This ignores whitespace
1836 at line end, and considers all other sequences of one or
1837 more whitespace characters to be equivalent.
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1838</p>
1839</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1840<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1841-w
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1842</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1843<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1844--ignore-all-space
1845</dt>
1846<dd>
1847<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1848 Ignore whitespace when comparing lines. This ignores
1849 differences even if one line has whitespace where the other
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1850 line has none.
1851</p>
1852</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1853<dt class="hdlist1">
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]1854--ignore-blank-lines
1855</dt>
1856<dd>
1857<p>
1858 Ignore changes whose lines are all blank.
1859</p>
1860</dd>
1861<dt class="hdlist1">
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]1862--inter-hunk-context=&lt;lines&gt;
1863</dt>
1864<dd>
1865<p>
1866 Show the context between diff hunks, up to the specified number
1867 of lines, thereby fusing hunks that are close to each other.
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1868 Defaults to <code>diff.interHunkContext</code> or 0 if the config option
1869 is unset.
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]1870</p>
1871</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1872<dt class="hdlist1">
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]1873-W
1874</dt>
1875<dt class="hdlist1">
1876--function-context
1877</dt>
1878<dd>
1879<p>
1880 Show whole surrounding functions of changes.
1881</p>
1882</dd>
1883<dt class="hdlist1">
Junio C Hamano48fd2f62007-03-19 02:02:30[diff] [blame]1884--exit-code
1885</dt>
1886<dd>
1887<p>
1888 Make the program exit with codes similar to diff(1).
1889 That is, it exits with 1 if there were differences and
1890 0 means no differences.
1891</p>
1892</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1893<dt class="hdlist1">
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1894--quiet
1895</dt>
1896<dd>
1897<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1898 Disable all output of the program. Implies <code>--exit-code</code>.
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1899</p>
1900</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1901<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1902--ext-diff
1903</dt>
1904<dd>
1905<p>
1906 Allow an external diff helper to be executed. If you set an
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1907 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
1908 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]1909</p>
1910</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1911<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1912--no-ext-diff
1913</dt>
1914<dd>
1915<p>
1916 Disallow external diff drivers.
1917</p>
1918</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1919<dt class="hdlist1">
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1920--textconv
1921</dt>
1922<dt class="hdlist1">
1923--no-textconv
1924</dt>
1925<dd>
1926<p>
1927 Allow (or disallow) external text conversion filters to be run
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1928 when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1929 details. Because textconv filters are typically a one-way
1930 conversion, the resulting diff is suitable for human
1931 consumption, but cannot be applied. For this reason, textconv
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1932 filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
1933 <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]1934 diff plumbing commands.
1935</p>
1936</dd>
1937<dt class="hdlist1">
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1938--ignore-submodules[=&lt;when&gt;]
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1939</dt>
1940<dd>
1941<p>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1942 Ignore changes to submodules in the diff generation. &lt;when&gt; can be
Junio C Hamanoc7102962013-05-29 23:57:17[diff] [blame]1943 either "none", "untracked", "dirty" or "all", which is the default.
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1944 Using "none" will consider the submodule modified when it either contains
1945 untracked or modified files or its HEAD differs from the commit recorded
1946 in the superproject and can be used to override any settings of the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1947 <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]1948 "untracked" is used submodules are not considered dirty when they only
1949 contain untracked content (but they are still scanned for modified
1950 content). Using "dirty" ignores all changes to the work tree of submodules,
1951 only changes to the commits stored in the superproject are shown (this was
1952 the behavior until 1.7.0). Using "all" hides all changes to submodules.
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1953</p>
1954</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1955<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1956--src-prefix=&lt;prefix&gt;
1957</dt>
1958<dd>
1959<p>
1960 Show the given source prefix instead of "a/".
1961</p>
1962</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1963<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1964--dst-prefix=&lt;prefix&gt;
1965</dt>
1966<dd>
1967<p>
1968 Show the given destination prefix instead of "b/".
1969</p>
1970</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1971<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1972--no-prefix
1973</dt>
1974<dd>
1975<p>
1976 Do not show any source or destination prefix.
1977</p>
1978</dd>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]1979<dt class="hdlist1">
1980--line-prefix=&lt;prefix&gt;
1981</dt>
1982<dd>
1983<p>
1984 Prepend an additional prefix to every line of output.
1985</p>
1986</dd>
Junio C Hamanof7017f12016-10-27 23:31:34[diff] [blame]1987<dt class="hdlist1">
1988--ita-invisible-in-index
1989</dt>
1990<dd>
1991<p>
1992 By default entries added by "git add -N" appear as an existing
1993 empty file in "git diff" and a new file in "git diff --cached".
1994 This option makes the entry appear as a new file in "git diff"
1995 and non-existent in "git diff --cached". This option could be
1996 reverted with <code>--ita-visible-in-index</code>. Both options are
1997 experimental and could be removed in future.
1998</p>
1999</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2000</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2001<div class="paragraph"><p>For more detailed explanation on these common options, see also
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2002<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2003<div class="dlist"><dl>
2004<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2005-1 --base
2006</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2007<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2008-2 --ours
2009</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2010<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2011-3 --theirs
2012</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2013<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2014-0
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2015</dt>
2016<dd>
2017<p>
2018 Diff against the "base" version, "our branch" or "their
2019 branch" respectively. With these options, diffs for
2020 merged entries are not shown.
2021</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2022<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]2023cleanly resolved paths. The option -0 can be given to
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2024omit diff output for unmerged entries and just show "Unmerged".</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2025</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2026<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]2027-c
2028</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2029<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]2030--cc
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2031</dt>
2032<dd>
2033<p>
2034 This compares stage 2 (our branch), stage 3 (their
2035 branch) and the working tree file and outputs a combined
2036 diff, similar to the way <em>diff-tree</em> shows a merge
2037 commit with these flags.
2038</p>
2039</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2040<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2041-q
2042</dt>
2043<dd>
2044<p>
Junio C Hamano51c2ab02006-07-09 20:38:54[diff] [blame]2045 Remain silent even on nonexistent files
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2046</p>
2047</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2048</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2049</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2050</div>
2051<div class="sect1">
Junio C Hamano543f8d62009-07-29 08:35:21[diff] [blame]2052<h2 id="_raw_output_format">Raw output format</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2053<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2054<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]2055"git-diff-files" and "git diff --raw" are very similar.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2056<div class="paragraph"><p>These commands all compare two sets of things; what is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2057compared differs:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2058<div class="dlist"><dl>
2059<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2060git-diff-index &lt;tree-ish&gt;
2061</dt>
2062<dd>
2063<p>
2064 compares the &lt;tree-ish&gt; and the files on the filesystem.
2065</p>
2066</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2067<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2068git-diff-index --cached &lt;tree-ish&gt;
2069</dt>
2070<dd>
2071<p>
2072 compares the &lt;tree-ish&gt; and the index.
2073</p>
2074</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2075<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2076git-diff-tree [-r] &lt;tree-ish-1&gt; &lt;tree-ish-2&gt; [&lt;pattern&gt;&#8230;]
2077</dt>
2078<dd>
2079<p>
2080 compares the trees named by the two arguments.
2081</p>
2082</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2083<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2084git-diff-files [&lt;pattern&gt;&#8230;]
2085</dt>
2086<dd>
2087<p>
2088 compares the index and the files on the filesystem.
2089</p>
2090</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2091</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2092<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]2093what is being compared. After that, all the commands print one output
2094line per changed file.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2095<div class="paragraph"><p>An output line is formatted this way:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2096<div class="listingblock">
2097<div class="content">
Junio C Hamanof2b280b2018-12-01 14:45:01[diff] [blame]2098<pre><code>in-place edit :100644 100644 bcd1234 0123456 M file0
2099copy-edit :100644 100644 abcd123 1234567 C68 file1 file2
2100rename-edit :100644 100644 abcd123 1234567 R86 file1 file3
2101create :000000 100644 0000000 1234567 A file4
2102delete :100644 000000 1234567 0000000 D file5
2103unmerged :000000 000000 0000000 0000000 U file6</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2104</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2105<div class="paragraph"><p>That is, from the left to the right:</p></div>
2106<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2107<li>
2108<p>
2109a colon.
2110</p>
2111</li>
2112<li>
2113<p>
2114mode for "src"; 000000 if creation or unmerged.
2115</p>
2116</li>
2117<li>
2118<p>
2119a space.
2120</p>
2121</li>
2122<li>
2123<p>
2124mode for "dst"; 000000 if deletion or unmerged.
2125</p>
2126</li>
2127<li>
2128<p>
2129a space.
2130</p>
2131</li>
2132<li>
2133<p>
2134sha1 for "src"; 0{40} if creation or unmerged.
2135</p>
2136</li>
2137<li>
2138<p>
2139a space.
2140</p>
2141</li>
2142<li>
2143<p>
2144sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
2145</p>
2146</li>
2147<li>
2148<p>
2149a space.
2150</p>
2151</li>
2152<li>
2153<p>
2154status, followed by optional "score" number.
2155</p>
2156</li>
2157<li>
2158<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2159a tab or a NUL when <code>-z</code> option is used.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2160</p>
2161</li>
2162<li>
2163<p>
2164path for "src"
2165</p>
2166</li>
2167<li>
2168<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2169a 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]2170</p>
2171</li>
2172<li>
2173<p>
2174path for "dst"; only exists for C or R.
2175</p>
2176</li>
2177<li>
2178<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2179an 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]2180</p>
2181</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2182</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2183<div class="paragraph"><p>Possible status letters are:</p></div>
2184<div class="ulist"><ul>
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]2185<li>
2186<p>
2187A: addition of a file
2188</p>
2189</li>
2190<li>
2191<p>
2192C: copy of a file into a new one
2193</p>
2194</li>
2195<li>
2196<p>
2197D: deletion of a file
2198</p>
2199</li>
2200<li>
2201<p>
2202M: modification of the contents or mode of a file
2203</p>
2204</li>
2205<li>
2206<p>
2207R: renaming of a file
2208</p>
2209</li>
2210<li>
2211<p>
2212T: change in the type of the file
2213</p>
2214</li>
2215<li>
2216<p>
2217U: file is unmerged (you must complete the merge before it can
Junio C Hamano2f5a9892019-12-25 21:12:55[diff] [blame]2218 be committed)
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]2219</p>
2220</li>
2221<li>
2222<p>
2223X: "unknown" change type (most probably a bug, please report it)
2224</p>
2225</li>
2226</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2227<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]2228percentage of similarity between the source and target of the move or
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]2229copy). Status letter M may be followed by a score (denoting the
2230percentage of dissimilarity) for file rewrites.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2231<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]2232and it is out of sync with the index.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2233<div class="paragraph"><p>Example:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2234<div class="listingblock">
2235<div class="content">
Junio C Hamanof2b280b2018-12-01 14:45:01[diff] [blame]2236<pre><code>:100644 100644 5be4a4a 0000000 M file.c</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2237</div></div>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]2238<div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2239quoted as explained for the configuration variable <code>core.quotePath</code>
2240(see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2241verbatim and the line is terminated by a NUL byte.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2242</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2243</div>
2244<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2245<h2 id="_diff_format_for_merges">diff format for merges</h2>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2246<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2247<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2248can take <code>-c</code> or <code>--cc</code> option
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2249to generate diff output also for merge commits. The output differs
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2250from the format described above in the following way:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2251<div class="olist arabic"><ol class="arabic">
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2252<li>
2253<p>
2254there is a colon for each parent
2255</p>
2256</li>
2257<li>
2258<p>
2259there are more "src" modes and "src" sha1
2260</p>
2261</li>
2262<li>
2263<p>
2264status is concatenated status characters for each parent
2265</p>
2266</li>
2267<li>
2268<p>
2269no optional "score" number
2270</p>
2271</li>
2272<li>
2273<p>
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2274tab-separated pathname(s) of the file
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2275</p>
2276</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2277</ol></div>
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2278<div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2279if the file was renamed on any side of history. With
2280<code>--combined-all-paths</code>, the name of the path in each parent is shown
2281followed by the name of the path in the merge commit.</p></div>
2282<div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2283<div class="listingblock">
2284<div class="content">
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2285<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c
2286::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
2287::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c</code></pre>
2288</div></div>
2289<div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2290<div class="listingblock">
2291<div class="content">
2292<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c desc.c desc.c
2293::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM foo.sh bar.sh bar.sh
2294::100644 100644 100644 e07d6c5 9042e82 ee91881 RR fooey.c fuey.c phooey.c</code></pre>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2295</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2296<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]2297all parents.</p></div>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2298</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2299</div>
2300<div class="sect1">
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2301<h2 id="_generating_patch_text_with_p">Generating patch text with -p</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2302<div class="sectionbody">
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2303<div class="paragraph"><p>Running
2304<a href="git-diff.html">git-diff(1)</a>,
2305<a href="git-log.html">git-log(1)</a>,
2306<a href="git-show.html">git-show(1)</a>,
2307<a href="git-diff-index.html">git-diff-index(1)</a>,
2308<a href="git-diff-tree.html">git-diff-tree(1)</a>, or
2309<a href="git-diff-files.html">git-diff-files(1)</a>
2310with the <code>-p</code> option produces patch text.
2311You can customize the creation of patch text via the
Junio C Hamano042f2142016-06-27 18:05:05[diff] [blame]2312<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]2313<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]2314diff format:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2315<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2316<li>
2317<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2318It is preceded with a "git diff" header that looks like this:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2319</p>
2320<div class="literalblock">
2321<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2322<pre><code>diff --git a/file1 b/file2</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2323</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2324<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]2325involved. Especially, even for a creation or a deletion,
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2326<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2327<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]2328name of the source file of the rename/copy and the name of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2329the file that rename/copy produces, respectively.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2330</li>
2331<li>
2332<p>
2333It is followed by one or more extended header lines:
2334</p>
2335<div class="literalblock">
2336<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2337<pre><code>old mode &lt;mode&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2338new mode &lt;mode&gt;
2339deleted file mode &lt;mode&gt;
2340new file mode &lt;mode&gt;
2341copy from &lt;path&gt;
2342copy to &lt;path&gt;
2343rename from &lt;path&gt;
2344rename to &lt;path&gt;
2345similarity index &lt;number&gt;
2346dissimilarity index &lt;number&gt;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2347index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2348</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2349<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]2350and file permission bits.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2351<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]2352<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2353the dissimilarity index is the percentage of changed lines. It
2354is a rounded down integer, followed by a percent sign. The
2355similarity index value of 100% is thus reserved for two equal
2356files, while 100% dissimilarity means that no line from the old
2357file made it into the new one.</p></div>
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2358<div class="paragraph"><p>The index line includes the blob object names before and after the change.
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2359The &lt;mode&gt; is included if the file mode does not change; otherwise,
2360separate lines indicate the old and the new mode.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2361</li>
2362<li>
2363<p>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]2364Pathnames with "unusual" characters are quoted as explained for
2365 the configuration variable <code>core.quotePath</code> (see
2366 <a href="git-config.html">git-config(1)</a>).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2367</p>
2368</li>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2369<li>
2370<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2371All the <code>file1</code> files in the output refer to files before the
2372 commit, and all the <code>file2</code> files refer to files after the commit.
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2373 It is incorrect to apply each change to each file sequentially. For
2374 example, this patch will swap a and b:
2375</p>
2376<div class="literalblock">
2377<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2378<pre><code>diff --git a/a b/b
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2379rename from a
2380rename to b
2381diff --git a/b b/a
2382rename from b
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2383rename to a</code></pre>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2384</div></div>
2385</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2386</ol></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2387</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2388</div>
2389<div class="sect1">
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2390<h2 id="_combined_diff_format">Combined diff format</h2>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2391<div class="sectionbody">
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]2392<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]2393produce a <em>combined diff</em> when showing a merge. This is the default
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2394format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]2395<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]2396of these commands to force generation of diffs with individual parents
2397of a merge.</p></div>
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2398<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2399<div class="listingblock">
2400<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2401<pre><code>diff --combined describe.c
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2402index fabadb8,cc95eb0..4866510
2403--- a/describe.c
2404+++ b/describe.c
2405@@@ -98,20 -98,12 +98,20 @@@
2406 return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2407 }
2408
2409- static void describe(char *arg)
2410 -static void describe(struct commit *cmit, int last_one)
2411++static void describe(char *arg, int last_one)
2412 {
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2413 + unsigned char sha1[20];
2414 + struct commit *cmit;
2415 struct commit_list *list;
2416 static int initialized = 0;
2417 struct commit_name *n;
2418
2419 + if (get_sha1(arg, sha1) &lt; 0)
2420 + usage(describe_usage);
2421 + cmit = lookup_commit_reference(sha1);
2422 + if (!cmit)
2423 + usage(describe_usage);
2424 +
2425 if (!initialized) {
2426 initialized = 1;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2427 for_each_ref(get_name);</code></pre>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2428</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2429<div class="olist arabic"><ol class="arabic">
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2430<li>
2431<p>
2432It is preceded with a "git diff" header, that looks like
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2433 this (when the <code>-c</code> option is used):
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2434</p>
2435<div class="literalblock">
2436<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2437<pre><code>diff --combined file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2438</div></div>
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2439<div class="paragraph"><p>or like this (when the <code>--cc</code> option is used):</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2440<div class="literalblock">
2441<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2442<pre><code>diff --cc file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2443</div></div>
2444</li>
2445<li>
2446<p>
2447It is followed by one or more extended header lines
2448 (this example shows a merge with two parents):
2449</p>
2450<div class="literalblock">
2451<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2452<pre><code>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2453mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
2454new file mode &lt;mode&gt;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2455deleted file mode &lt;mode&gt;,&lt;mode&gt;</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2456</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2457<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]2458the &lt;mode&gt; is different from the rest. Extended headers with
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2459information about detected contents movement (renames and
2460copying detection) are designed to work with diff of two
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2461&lt;tree-ish&gt; and are not used by combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2462</li>
2463<li>
2464<p>
2465It is followed by two-line from-file/to-file header
2466</p>
2467<div class="literalblock">
2468<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2469<pre><code>--- a/file
2470+++ b/file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2471</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2472<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]2473format, <code>/dev/null</code> is used to signal created or deleted
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2474files.</p></div>
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2475<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2476two-line from-file/to-file you get a N+1 line from-file/to-file header,
2477where N is the number of parents in the merge commit</p></div>
2478<div class="literalblock">
2479<div class="content">
2480<pre><code>--- a/file
2481--- a/file
2482--- a/file
2483+++ b/file</code></pre>
2484</div></div>
2485<div class="paragraph"><p>This extended format can be useful if rename or copy detection is
2486active, to allow you to see the original name of the file in different
2487parents.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2488</li>
2489<li>
2490<p>
2491Chunk header format is modified to prevent people from
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2492 accidentally feeding it to <code>patch -p1</code>. Combined diff format
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2493 was created for review of merge commit changes, and was not
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2494 meant to be applied. The change is similar to the change in the
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2495 extended <em>index</em> header:
2496</p>
2497<div class="literalblock">
2498<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2499<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]2500</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2501<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]2502header for combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2503</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2504</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2505<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]2506files 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
2507added to B), or <code>" "</code> (space&#8201;&#8212;&#8201;unchanged) prefix, this format
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2508compares two or more files file1, file2,&#8230; with one file X, and
2509shows how X differs from each of fileN. One column for each of
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2510fileN is prepended to the output line to note how X&#8217;s line is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2511different from it.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2512<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2513fileN but it does not appear in the result. A <code>+</code> character
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]2514in the column N means that the line appears in the result,
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2515and fileN does not have that line (in other words, the line was
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2516added, from the point of view of that parent).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2517<div class="paragraph"><p>In the above example output, the function signature was changed
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2518from both files (hence two <code>-</code> removals from both file1 and
2519file2, plus <code>++</code> to mean one line that was added does not appear
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]2520in either file1 or file2). Also eight other lines are the same
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2521from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
2522<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]2523merge commit with the merge result (i.e. file1..fileN are the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2524parents). When shown by <code>git diff-files -c</code>, it compares the
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2525two unresolved merge parents with the working tree file
2526(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2527"their version").</p></div>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2528</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2529</div>
2530<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2531<h2 id="_other_diff_formats">other diff formats</h2>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2532<div class="sectionbody">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2533<div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2534copied files. The <code>--stat</code> option adds diffstat(1) graph to the
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2535output. These options can be combined with other options, such as
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2536<code>-p</code>, and are meant for human consumption.</p></div>
2537<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]2538formats the pathnames compactly by combining common prefix and suffix of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2539the pathnames. For example, a change that moves <code>arch/i386/Makefile</code> to
2540<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]2541<div class="listingblock">
2542<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2543<pre><code>arch/{i386 =&gt; x86}/Makefile | 4 +--</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2544</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2545<div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2546for easier machine consumption. An entry in <code>--numstat</code> output looks
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2547like this:</p></div>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2548<div class="listingblock">
2549<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2550<pre><code>1 2 README
25513 1 arch/{i386 =&gt; x86}/Makefile</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2552</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2553<div class="paragraph"><p>That is, from left to right:</p></div>
2554<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2555<li>
2556<p>
2557the number of added lines;
2558</p>
2559</li>
2560<li>
2561<p>
2562a tab;
2563</p>
2564</li>
2565<li>
2566<p>
2567the number of deleted lines;
2568</p>
2569</li>
2570<li>
2571<p>
2572a tab;
2573</p>
2574</li>
2575<li>
2576<p>
2577pathname (possibly with rename/copy information);
2578</p>
2579</li>
2580<li>
2581<p>
2582a newline.
2583</p>
2584</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2585</ol></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2586<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]2587<div class="listingblock">
2588<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2589<pre><code>1 2 README NUL
25903 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2591</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2592<div class="paragraph"><p>That is:</p></div>
2593<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2594<li>
2595<p>
2596the number of added lines;
2597</p>
2598</li>
2599<li>
2600<p>
2601a tab;
2602</p>
2603</li>
2604<li>
2605<p>
2606the number of deleted lines;
2607</p>
2608</li>
2609<li>
2610<p>
2611a tab;
2612</p>
2613</li>
2614<li>
2615<p>
2616a NUL (only exists if renamed/copied);
2617</p>
2618</li>
2619<li>
2620<p>
2621pathname in preimage;
2622</p>
2623</li>
2624<li>
2625<p>
2626a NUL (only exists if renamed/copied);
2627</p>
2628</li>
2629<li>
2630<p>
2631pathname in postimage (only exists if renamed/copied);
2632</p>
2633</li>
2634<li>
2635<p>
2636a NUL.
2637</p>
2638</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2639</ol></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2640<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]2641scripts that read the output to tell if the current record being read is
2642a single-path record or a rename/copy record without reading ahead.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2643After reading added and deleted lines, reading up to <code>NUL</code> would yield
2644the 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]2645</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2646</div>
2647<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2648<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2649<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2650<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]2651</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]2652</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2653</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]2654<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2655<div id="footer">
2656<div id="footer-text">
Junio C Hamano2ef0ba32018-01-26 23:13:53[diff] [blame]2657Last updated
Junio C Hamano7a46cd62020-03-15 21:57:10[diff] [blame]2658 2013-08-20 08:40:27 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2659</div>
2660</div>
2661</body>
2662</html>