Google Git
Sign in
chromium / external / gitster / git-htmldocs / cf9c77377796343e741a25077f837f607513c7bb / . / git-diff-files.html
blob: f26773dc25426ca5a662409f451b5b8c2c09603d [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 Hamanoa85030a2022-07-27 16:48:21[diff] [blame]7<meta name="generator" content="AsciiDoc 10.2.0" />
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 Hamano2b153182021-12-15 21:00:31[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;
583 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
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");
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];
612 if (entry.nodeName.toLowerCase() == 'div'
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.
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 () {
649 // Delete existing footnote entries in case we're reloading the footnodes.
650 var i;
651 var noteholder = document.getElementById("footnotes");
652 if (!noteholder) {
653 return;
654 }
655 var entriesToRemove = [];
656 for (i = 0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
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");
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++;
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 }
683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n + "'>" +
685 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
686 n + "</a>. " + note + "</div>";
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 }
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;
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 Hamanocf9c7732022-10-28 18:56:06[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>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]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 Hamanoee43d182020-11-11 22:10:41[diff] [blame]805 the usual three.
806 Implies <code>--patch</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>
Junio C Hamano4078a552021-04-30 06:08:10[diff] [blame]1145 Show only names of changed files. The file names are often encoded in UTF-8.
1146 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1147 manual page.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1148</p>
1149</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1150<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1151--name-status
1152</dt>
1153<dd>
1154<p>
Junio C Hamanoa9aee782008-04-23 16:09:20[diff] [blame]1155 Show only names and status of changed files. See the description
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1156 of the <code>--diff-filter</code> option on what the status letters mean.
Junio C Hamano4078a552021-04-30 06:08:10[diff] [blame]1157 Just like <code>--name-only</code> the file names are often encoded in UTF-8.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1158</p>
1159</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1160<dt class="hdlist1">
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1161--submodule[=&lt;format&gt;]
1162</dt>
1163<dd>
1164<p>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]1165 Specify how differences in submodules are shown. When specifying
1166 <code>--submodule=short</code> the <em>short</em> format is used. This format just
1167 shows the names of the commits at the beginning and end of the range.
1168 When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em>
1169 format is used. This format lists the commits in the range like
1170 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
1171 is specified, the <em>diff</em> format is used. This format shows an
1172 inline diff of the changes in the submodule contents between the
1173 commit range. Defaults to <code>diff.submodule</code> or the <em>short</em> format
1174 if the config option is unset.
Junio C Hamanoc21ab052009-10-31 04:03:55[diff] [blame]1175</p>
1176</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1177<dt class="hdlist1">
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]1178--color[=&lt;when&gt;]
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1179</dt>
1180<dd>
1181<p>
1182 Show colored diff.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1183 <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
1184 <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]1185</p>
1186</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1187<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1188--no-color
1189</dt>
1190<dd>
1191<p>
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]1192 Turn off colored diff.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1193 It is the same as <code>--color=never</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1194</p>
1195</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1196<dt class="hdlist1">
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1197--color-moved[=&lt;mode&gt;]
1198</dt>
1199<dd>
1200<p>
1201 Moved lines of code are colored differently.
1202 The &lt;mode&gt; defaults to <em>no</em> if the option is not given
1203 and to <em>zebra</em> if the option with no mode is given.
1204 The mode must be one of:
1205</p>
1206<div class="openblock">
1207<div class="content">
1208<div class="dlist"><dl>
1209<dt class="hdlist1">
1210no
1211</dt>
1212<dd>
1213<p>
1214 Moved lines are not highlighted.
1215</p>
1216</dd>
1217<dt class="hdlist1">
1218default
1219</dt>
1220<dd>
1221<p>
1222 Is a synonym for <code>zebra</code>. This may change to a more sensible mode
1223 in the future.
1224</p>
1225</dd>
1226<dt class="hdlist1">
1227plain
1228</dt>
1229<dd>
1230<p>
1231 Any line that is added in one location and was removed
1232 in another location will be colored with <em>color.diff.newMoved</em>.
1233 Similarly <em>color.diff.oldMoved</em> will be used for removed lines
1234 that are added somewhere else in the diff. This mode picks up any
1235 moved line, but it is not very useful in a review to determine
1236 if a block of code was moved without permutation.
1237</p>
1238</dd>
1239<dt class="hdlist1">
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1240blocks
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1241</dt>
1242<dd>
1243<p>
1244 Blocks of moved text of at least 20 alphanumeric characters
1245 are detected greedily. The detected blocks are
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1246 painted using either the <em>color.diff.{old,new}Moved</em> color.
1247 Adjacent blocks cannot be told apart.
1248</p>
1249</dd>
1250<dt class="hdlist1">
1251zebra
1252</dt>
1253<dd>
1254<p>
1255 Blocks of moved text are detected as in <em>blocks</em> mode. The blocks
1256 are painted using either the <em>color.diff.{old,new}Moved</em> color or
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1257 <em>color.diff.{old,new}MovedAlternative</em>. The change between
1258 the two colors indicates that a new block was detected.
1259</p>
1260</dd>
1261<dt class="hdlist1">
Junio C Hamanobfd91f42018-08-17 22:21:16[diff] [blame]1262dimmed-zebra
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1263</dt>
1264<dd>
1265<p>
1266 Similar to <em>zebra</em>, but additional dimming of uninteresting parts
1267 of moved code is performed. The bordering lines of two adjacent
1268 blocks are considered interesting, the rest is uninteresting.
Junio C Hamanobfd91f42018-08-17 22:21:16[diff] [blame]1269 <code>dimmed_zebra</code> is a deprecated synonym.
Junio C Hamanofb1fdf12017-08-27 06:14:59[diff] [blame]1270</p>
1271</dd>
1272</dl></div>
1273</div></div>
1274</dd>
1275<dt class="hdlist1">
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1276--no-color-moved
1277</dt>
1278<dd>
1279<p>
1280 Turn off move detection. This can be used to override configuration
1281 settings. It is the same as <code>--color-moved=no</code>.
1282</p>
1283</dd>
1284<dt class="hdlist1">
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1285--color-moved-ws=&lt;modes&gt;
1286</dt>
1287<dd>
1288<p>
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1289 This configures how whitespace is ignored when performing the
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1290 move detection for <code>--color-moved</code>.
1291 These modes can be given as a comma separated list:
1292</p>
1293<div class="openblock">
1294<div class="content">
1295<div class="dlist"><dl>
1296<dt class="hdlist1">
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1297no
1298</dt>
1299<dd>
1300<p>
1301 Do not ignore whitespace when performing move detection.
1302</p>
1303</dd>
1304<dt class="hdlist1">
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1305ignore-space-at-eol
1306</dt>
1307<dd>
1308<p>
1309 Ignore changes in whitespace at EOL.
1310</p>
1311</dd>
1312<dt class="hdlist1">
1313ignore-space-change
1314</dt>
1315<dd>
1316<p>
1317 Ignore changes in amount of whitespace. This ignores whitespace
1318 at line end, and considers all other sequences of one or
1319 more whitespace characters to be equivalent.
1320</p>
1321</dd>
1322<dt class="hdlist1">
1323ignore-all-space
1324</dt>
1325<dd>
1326<p>
1327 Ignore whitespace when comparing lines. This ignores differences
1328 even if one line has whitespace where the other line has none.
1329</p>
1330</dd>
1331<dt class="hdlist1">
1332allow-indentation-change
1333</dt>
1334<dd>
1335<p>
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1336 Initially ignore any whitespace in the move detection, then
Junio C Hamanof09b7cd2018-08-02 23:01:45[diff] [blame]1337 group the moved code blocks only into a block if the change in
1338 whitespace is the same per line. This is incompatible with the
1339 other modes.
1340</p>
1341</dd>
1342</dl></div>
1343</div></div>
1344</dd>
1345<dt class="hdlist1">
Junio C Hamanoa90214f2019-01-28 22:05:25[diff] [blame]1346--no-color-moved-ws
1347</dt>
1348<dd>
1349<p>
1350 Do not ignore whitespace when performing move detection. This can be
1351 used to override configuration settings. It is the same as
1352 <code>--color-moved-ws=no</code>.
1353</p>
1354</dd>
1355<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1356--word-diff[=&lt;mode&gt;]
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1357</dt>
1358<dd>
1359<p>
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1360 Show a word diff, using the &lt;mode&gt; to delimit changed words.
1361 By default, words are delimited by whitespace; see
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1362 <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]1363 must be one of:
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1364</p>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1365<div class="openblock">
1366<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1367<div class="dlist"><dl>
1368<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1369color
1370</dt>
1371<dd>
1372<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1373 Highlight changed words using only colors. Implies <code>--color</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1374</p>
1375</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1376<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1377plain
1378</dt>
1379<dd>
1380<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1381 Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1382 attempts to escape the delimiters if they appear in the input,
1383 so the output may be ambiguous.
1384</p>
1385</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1386<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1387porcelain
1388</dt>
1389<dd>
1390<p>
1391 Use a special line-based format intended for script
1392 consumption. Added/removed/unchanged runs are printed in the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1393 usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1394 character at the beginning of the line and extending to the
1395 end of the line. Newlines in the input are represented by a
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1396 tilde <code>~</code> on a line of its own.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1397</p>
1398</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1399<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1400none
1401</dt>
1402<dd>
1403<p>
1404 Disable word diff again.
1405</p>
1406</dd>
1407</dl></div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]1408</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1409<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]1410highlight the changed parts in all modes if enabled.</p></div>
1411</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1412<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1413--word-diff-regex=&lt;regex&gt;
1414</dt>
1415<dd>
1416<p>
1417 Use &lt;regex&gt; to decide what a word is, instead of considering
1418 runs of non-whitespace to be a word. Also implies
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1419 <code>--word-diff</code> unless it was already enabled.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1420</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1421<div class="paragraph"><p>Every non-overlapping match of the
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1422&lt;regex&gt; is considered a word. Anything between these matches is
1423considered whitespace and ignored(!) for the purposes of finding
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1424differences. You may want to append <code>|[^[:space:]]</code> to your regular
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]1425expression to make sure that it matches all non-whitespace characters.
1426A match that contains a newline is silently truncated(!) at the
1427newline.</p></div>
Junio C Hamano713eded2015-12-03 00:24:02[diff] [blame]1428<div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1429and, correspondingly, show differences character by character.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1430<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]1431<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]1432overrides any diff driver or configuration setting. Diff drivers
1433override configuration settings.</p></div>
Junio C Hamano85e45fa2006-08-13 07:47:41[diff] [blame]1434</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1435<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1436--color-words[=&lt;regex&gt;]
1437</dt>
1438<dd>
1439<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1440 Equivalent to <code>--word-diff=color</code> plus (if a regex was
1441 specified) <code>--word-diff-regex=&lt;regex&gt;</code>.
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]1442</p>
1443</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1444<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1445--no-renames
1446</dt>
1447<dd>
1448<p>
1449 Turn off rename detection, even when the configuration
1450 file gives the default to do so.
1451</p>
1452</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1453<dt class="hdlist1">
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]1454--[no-]rename-empty
1455</dt>
1456<dd>
1457<p>
1458 Whether to use empty blobs as rename source.
1459</p>
1460</dd>
1461<dt class="hdlist1">
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1462--check
1463</dt>
1464<dd>
1465<p>
Junio C Hamano84ea1e42016-04-08 21:53:48[diff] [blame]1466 Warn if changes introduce conflict markers or whitespace errors.
1467 What are considered whitespace errors is controlled by <code>core.whitespace</code>
Junio C Hamano6005bfa2011-06-23 00:51:22[diff] [blame]1468 configuration. By default, trailing whitespaces (including
Junio C Hamano14e66832018-06-18 18:32:19[diff] [blame]1469 lines that consist solely of whitespaces) and a space character
Junio C Hamano6005bfa2011-06-23 00:51:22[diff] [blame]1470 that is immediately followed by a tab character inside the
1471 initial indent of the line are considered whitespace errors.
1472 Exits with non-zero status if problems are found. Not compatible
1473 with --exit-code.
Junio C Hamanoa890c4f2007-01-28 10:29:21[diff] [blame]1474</p>
1475</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1476<dt class="hdlist1">
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]1477--ws-error-highlight=&lt;kind&gt;
1478</dt>
1479<dd>
1480<p>
Junio C Hamano4b2a6c12017-08-22 18:32:37[diff] [blame]1481 Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
1482 lines of the diff. Multiple values are separated by comma,
1483 <code>none</code> resets previous values, <code>default</code> reset the list to
1484 <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. When
1485 this option is not given, and the configuration variable
1486 <code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
1487 <code>new</code> lines are highlighted. The whitespace errors are colored
Junio C Hamano14e66832018-06-18 18:32:19[diff] [blame]1488 with <code>color.diff.whitespace</code>.
Junio C Hamano8c5d5942015-06-11 19:37:48[diff] [blame]1489</p>
1490</dd>
1491<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1492--full-index
1493</dt>
1494<dd>
1495<p>
Junio C Hamano5cf43ca2008-08-20 09:14:14[diff] [blame]1496 Instead of the first handful of characters, show the full
1497 pre- and post-image blob object names on the "index"
1498 line when generating patch format output.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1499</p>
1500</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1501<dt class="hdlist1">
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1502--binary
1503</dt>
1504<dd>
1505<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1506 In addition to <code>--full-index</code>, output a binary diff that
Junio C Hamanoee43d182020-11-11 22:10:41[diff] [blame]1507 can be applied with <code>git-apply</code>.
1508 Implies <code>--patch</code>.
Junio C Hamano9ae1a062006-07-10 08:12:34[diff] [blame]1509</p>
1510</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1511<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1512--abbrev[=&lt;n&gt;]
1513</dt>
1514<dd>
1515<p>
1516 Instead of showing the full 40-byte hexadecimal object
1517 name in diff-raw format output and diff-tree header
Junio C Hamanoee43d182020-11-11 22:10:41[diff] [blame]1518 lines, show the shortest prefix that is at least <em>&lt;n&gt;</em>
1519 hexdigits long that uniquely refers the object.
Junio C Hamanocf8aeaf2020-08-31 23:16:35[diff] [blame]1520 In diff-patch output format, <code>--full-index</code> takes higher
1521 precedence, i.e. if <code>--full-index</code> is specified, full blob
1522 names will be shown regardless of <code>--abbrev</code>.
1523 Non default number of digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1524</p>
1525</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1526<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1527-B[&lt;n&gt;][/&lt;m&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1528</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1529<dt class="hdlist1">
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1530--break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]
1531</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1532<dd>
1533<p>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1534 Break complete rewrite changes into pairs of delete and
1535 create. This serves two purposes:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1536</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1537<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]1538not as a series of deletion and insertion mixed together with a very
1539few lines that happen to match textually as the context, but as a
1540single deletion of everything old followed by a single insertion of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1541everything new, and the number <code>m</code> controls this aspect of the -B
1542option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1543original should remain in the result for Git to consider it a total
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1544rewrite (i.e. otherwise the resulting patch will be a series of
1545deletion and insertion mixed together with context lines).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1546<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]1547source of a rename (usually -M only considers a file that disappeared
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1548as the source of a rename), and the number <code>n</code> controls this aspect of
1549the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1550addition and deletion compared to 20% or more of the file&#8217;s size are
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1551eligible for being picked up as a possible source of a rename to
1552another file.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1553</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1554<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1555-M[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1556</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1557<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1558--find-renames[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1559</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1560<dd>
1561<p>
1562 Detect renames.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1563 If <code>n</code> is specified, it is a threshold on the similarity
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1564 index (i.e. amount of addition/deletions compared to the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1565 file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1566 delete/add pair to be a rename if more than 90% of the file
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1567 hasn&#8217;t changed. Without a <code>%</code> sign, the number is to be read as
1568 a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
1569 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
1570 the same as <code>-M5%</code>. To limit detection to exact renames, use
1571 <code>-M100%</code>. The default similarity index is 50%.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1572</p>
1573</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1574<dt class="hdlist1">
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1575-C[&lt;n&gt;]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1576</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1577<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1578--find-copies[=&lt;n&gt;]
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]1579</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1580<dd>
1581<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1582 Detect copies as well as renames. See also <code>--find-copies-harder</code>.
1583 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]1584</p>
1585</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1586<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1587--find-copies-harder
1588</dt>
1589<dd>
1590<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1591 For performance reasons, by default, <code>-C</code> option finds copies only
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1592 if the original file of the copy was modified in the same
1593 changeset. This flag makes the command
1594 inspect unmodified files as candidates for the source of
1595 copy. This is a very expensive operation for large
Junio C Hamano16f98872007-06-12 16:09:14[diff] [blame]1596 projects, so use it with caution. Giving more than one
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1597 <code>-C</code> option has the same effect.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1598</p>
1599</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1600<dt class="hdlist1">
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]1601-D
1602</dt>
1603<dt class="hdlist1">
1604--irreversible-delete
1605</dt>
1606<dd>
1607<p>
1608 Omit the preimage for deletes, i.e. print only the header but not
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1609 the diff between the preimage and <code>/dev/null</code>. The resulting patch
1610 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]1611 solely for people who want to just concentrate on reviewing the
Junio C Hamanod16fd1b2017-08-04 16:41:51[diff] [blame]1612 text after the change. In addition, the output obviously lacks
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]1613 enough information to apply such a patch in reverse, even manually,
1614 hence the name of the option.
1615</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1616<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]1617of a delete/create pair.</p></div>
1618</dd>
1619<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1620-l&lt;num&gt;
1621</dt>
1622<dd>
1623<p>
Junio C Hamano20cf4932021-07-28 21:02:52[diff] [blame]1624 The <code>-M</code> and <code>-C</code> options involve some preliminary steps that
1625 can detect subsets of renames/copies cheaply, followed by an
1626 exhaustive fallback portion that compares all remaining
1627 unpaired destinations to all relevant sources. (For renames,
1628 only remaining unpaired sources are relevant; for copies, all
1629 original sources are relevant.) For N sources and
1630 destinations, this exhaustive check is O(N^2). This option
1631 prevents the exhaustive portion of rename/copy detection from
1632 running if the number of source/destination files involved
1633 exceeds the specified number. Defaults to diff.renameLimit.
1634 Note that a value of 0 is treated as unlimited.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1635</p>
1636</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1637<dt class="hdlist1">
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1638--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;[*]]
1639</dt>
1640<dd>
1641<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1642 Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
1643 Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
1644 type (i.e. regular file, symlink, submodule, &#8230;) changed (<code>T</code>),
1645 are Unmerged (<code>U</code>), are
1646 Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1647 Any combination of the filter characters (including none) can be used.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1648 When <code>*</code> (All-or-none) is added to the combination, all
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1649 paths are selected if there is any file that matches
1650 other criteria in the comparison; if there is no file
1651 that matches other criteria, nothing is selected.
1652</p>
Junio C Hamanoeed15af2016-07-25 22:49:42[diff] [blame]1653<div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude. E.g.
1654<code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>
Junio C Hamanof1fc6ca2022-02-17 01:32:33[diff] [blame]1655<div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1656renamed entries cannot appear if detection for those types is disabled.</p></div>
Junio C Hamano982eb112010-11-18 00:53:09[diff] [blame]1657</dd>
1658<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1659-S&lt;string&gt;
1660</dt>
1661<dd>
1662<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1663 Look for differences that change the number of occurrences of
1664 the specified string (i.e. addition/deletion) in a file.
1665 Intended for the scripter&#8217;s use.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1666</p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1667<div class="paragraph"><p>It is useful when you&#8217;re looking for an exact block of code (like a
1668struct), and want to know the history of that block since it first
1669came into being: use the feature iteratively to feed the interesting
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1670block 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]1671very first version of the block.</p></div>
Junio C Hamanoace33e42019-01-18 23:16:05[diff] [blame]1672<div class="paragraph"><p>Binary files are searched as well.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1673</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1674<dt class="hdlist1">
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1675-G&lt;regex&gt;
1676</dt>
1677<dd>
1678<p>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1679 Look for differences whose patch text contains added/removed
1680 lines that match &lt;regex&gt;.
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1681</p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1682<div class="paragraph"><p>To illustrate the difference between <code>-S&lt;regex&gt; --pickaxe-regex</code> and
1683<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]1684file:</p></div>
1685<div class="listingblock">
1686<div class="content">
Junio C Hamanob7e497f2020-02-12 21:41:37[diff] [blame]1687<pre><code>+ return frotz(nitfol, two-&gt;ptr, 1, 0);
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1688...
Junio C Hamanob7e497f2020-02-12 21:41:37[diff] [blame]1689- hit = frotz(nitfol, mf2.ptr, 1, 0);</code></pre>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1690</div></div>
Junio C Hamanob7e497f2020-02-12 21:41:37[diff] [blame]1691<div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1692-S"frotz\(nitfol" --pickaxe-regex</code> will not (because the number of
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1693occurrences of that string did not change).</p></div>
Junio C Hamanoace33e42019-01-18 23:16:05[diff] [blame]1694<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1695filter will be ignored.</p></div>
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]1696<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1697information.</p></div>
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1698</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1699<dt class="hdlist1">
Junio C Hamano7b9cce92018-01-23 22:34:27[diff] [blame]1700--find-object=&lt;object-id&gt;
1701</dt>
1702<dd>
1703<p>
1704 Look for differences that change the number of occurrences of
1705 the specified object. Similar to <code>-S</code>, just the argument is different
1706 in that it doesn&#8217;t search for a specific string but for a specific
1707 object id.
1708</p>
1709<div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1710<code>git-log</code> to also find trees.</p></div>
1711</dd>
1712<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1713--pickaxe-all
1714</dt>
1715<dd>
1716<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1717 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]1718 changeset, not just the files that contain the change
1719 in &lt;string&gt;.
1720</p>
1721</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1722<dt class="hdlist1">
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1723--pickaxe-regex
1724</dt>
1725<dd>
1726<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1727 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]1728 expression to match.
Junio C Hamanobfe9e752006-04-05 21:43:28[diff] [blame]1729</p>
1730</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1731<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1732-O&lt;orderfile&gt;
1733</dt>
1734<dd>
1735<p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1736 Control the order in which files appear in the output.
Junio C Hamano322c6242015-03-23 21:32:46[diff] [blame]1737 This overrides the <code>diff.orderFile</code> configuration variable
1738 (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]1739 use <code>-O/dev/null</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1740</p>
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1741<div class="paragraph"><p>The output order is determined by the order of glob patterns in
1742&lt;orderfile&gt;.
1743All files with pathnames that match the first pattern are output
1744first, all files with pathnames that match the second pattern (but not
1745the first) are output next, and so on.
1746All files with pathnames that do not match any pattern are output
1747last, as if there was an implicit match-all pattern at the end of the
1748file.
1749If multiple pathnames have the same rank (they match the same pattern
1750but no earlier patterns), their output order relative to each other is
1751the normal order.</p></div>
1752<div class="paragraph"><p>&lt;orderfile&gt; is parsed as follows:</p></div>
1753<div class="openblock">
1754<div class="content">
1755<div class="ulist"><ul>
1756<li>
1757<p>
1758Blank lines are ignored, so they can be used as separators for
1759 readability.
1760</p>
1761</li>
1762<li>
1763<p>
1764Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1765 for comments. Add a backslash ("<code>\</code>") to the beginning of the
1766 pattern if it starts with a hash.
1767</p>
1768</li>
1769<li>
1770<p>
1771Each other line contains a single pattern.
1772</p>
1773</li>
1774</ul></div>
1775</div></div>
1776<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]1777fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1778matches a pattern if removing any number of the final pathname
1779components matches the pattern. For example, the pattern "<code>foo*bar</code>"
1780matches "<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]1781</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1782<dt class="hdlist1">
Junio C Hamanoa372d5b2021-02-26 01:34:37[diff] [blame]1783--skip-to=&lt;file&gt;
1784</dt>
1785<dt class="hdlist1">
1786--rotate-to=&lt;file&gt;
1787</dt>
1788<dd>
1789<p>
1790 Discard the files before the named &lt;file&gt; from the output
1791 (i.e. <em>skip to</em>), or move them to the end of the output
1792 (i.e. <em>rotate to</em>). These were invented primarily for use
1793 of the <code>git difftool</code> command, and may not be very useful
1794 otherwise.
1795</p>
1796</dd>
1797<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1798-R
1799</dt>
1800<dd>
1801<p>
1802 Swap two inputs; that is, show differences from index or
1803 on-disk file to tree contents.
1804</p>
1805</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1806<dt class="hdlist1">
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1807--relative[=&lt;path&gt;]
1808</dt>
Junio C Hamano3ef9e672020-06-02 21:51:31[diff] [blame]1809<dt class="hdlist1">
1810--no-relative
1811</dt>
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1812<dd>
1813<p>
1814 When run from a subdirectory of the project, it can be
1815 told to exclude changes outside the directory and show
1816 pathnames relative to it with this option. When you are
1817 not in a subdirectory (e.g. in a bare repository), you
1818 can name which subdirectory to make the output relative
1819 to by giving a &lt;path&gt; as an argument.
Junio C Hamano3ef9e672020-06-02 21:51:31[diff] [blame]1820 <code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config
1821 option and previous <code>--relative</code>.
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1822</p>
1823</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1824<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1825-a
1826</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1827<dt class="hdlist1">
Junio C Hamanoc26f5482006-07-09 09:38:14[diff] [blame]1828--text
1829</dt>
1830<dd>
1831<p>
1832 Treat all files as text.
1833</p>
1834</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1835<dt class="hdlist1">
Junio C Hamano4886c772017-11-27 03:33:28[diff] [blame]1836--ignore-cr-at-eol
1837</dt>
1838<dd>
1839<p>
Junio C Hamano96153bf2018-04-25 08:25:34[diff] [blame]1840 Ignore carriage-return at the end of line when doing a comparison.
Junio C Hamano4886c772017-11-27 03:33:28[diff] [blame]1841</p>
1842</dd>
1843<dt class="hdlist1">
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1844--ignore-space-at-eol
1845</dt>
1846<dd>
1847<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1848 Ignore changes in whitespace at EOL.
Junio C Hamanofd468962007-02-14 23:45:04[diff] [blame]1849</p>
1850</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1851<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1852-b
1853</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1854<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1855--ignore-space-change
1856</dt>
1857<dd>
1858<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1859 Ignore changes in amount of whitespace. This ignores whitespace
1860 at line end, and considers all other sequences of one or
1861 more whitespace characters to be equivalent.
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1862</p>
1863</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1864<dt class="hdlist1">
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]1865-w
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1866</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1867<dt class="hdlist1">
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1868--ignore-all-space
1869</dt>
1870<dd>
1871<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]1872 Ignore whitespace when comparing lines. This ignores
1873 differences even if one line has whitespace where the other
Junio C Hamanod9c2d2f2006-12-06 08:59:07[diff] [blame]1874 line has none.
1875</p>
1876</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1877<dt class="hdlist1">
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]1878--ignore-blank-lines
1879</dt>
1880<dd>
1881<p>
1882 Ignore changes whose lines are all blank.
1883</p>
1884</dd>
1885<dt class="hdlist1">
Junio C Hamanodf3d3cd2020-11-02 22:05:05[diff] [blame]1886-I&lt;regex&gt;
1887</dt>
1888<dt class="hdlist1">
1889--ignore-matching-lines=&lt;regex&gt;
1890</dt>
1891<dd>
1892<p>
1893 Ignore changes whose all lines match &lt;regex&gt;. This option may
1894 be specified more than once.
1895</p>
1896</dd>
1897<dt class="hdlist1">
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]1898--inter-hunk-context=&lt;lines&gt;
1899</dt>
1900<dd>
1901<p>
1902 Show the context between diff hunks, up to the specified number
1903 of lines, thereby fusing hunks that are close to each other.
Junio C Hamanobcd98f42017-01-24 00:12:16[diff] [blame]1904 Defaults to <code>diff.interHunkContext</code> or 0 if the config option
1905 is unset.
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]1906</p>
1907</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1908<dt class="hdlist1">
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]1909-W
1910</dt>
1911<dt class="hdlist1">
1912--function-context
1913</dt>
1914<dd>
1915<p>
Junio C Hamanob7676d52020-11-18 22:15:08[diff] [blame]1916 Show whole function as context lines for each change.
1917 The function names are determined in the same way as
1918 <code>git diff</code> works out patch hunk headers (see <em>Defining a
1919 custom hunk-header</em> in <a href="gitattributes.html">gitattributes(5)</a>).
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]1920</p>
1921</dd>
1922<dt class="hdlist1">
Junio C Hamano48fd2f62007-03-19 02:02:30[diff] [blame]1923--exit-code
1924</dt>
1925<dd>
1926<p>
1927 Make the program exit with codes similar to diff(1).
1928 That is, it exits with 1 if there were differences and
1929 0 means no differences.
1930</p>
1931</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1932<dt class="hdlist1">
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1933--quiet
1934</dt>
1935<dd>
1936<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1937 Disable all output of the program. Implies <code>--exit-code</code>.
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]1938</p>
1939</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1940<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1941--ext-diff
1942</dt>
1943<dd>
1944<p>
1945 Allow an external diff helper to be executed. If you set an
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1946 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
1947 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]1948</p>
1949</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1950<dt class="hdlist1">
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]1951--no-ext-diff
1952</dt>
1953<dd>
1954<p>
1955 Disallow external diff drivers.
1956</p>
1957</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1958<dt class="hdlist1">
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1959--textconv
1960</dt>
1961<dt class="hdlist1">
1962--no-textconv
1963</dt>
1964<dd>
1965<p>
1966 Allow (or disallow) external text conversion filters to be run
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1967 when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
Junio C Hamanoc652aed2011-07-07 01:14:31[diff] [blame]1968 details. Because textconv filters are typically a one-way
1969 conversion, the resulting diff is suitable for human
1970 consumption, but cannot be applied. For this reason, textconv
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1971 filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
1972 <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]1973 diff plumbing commands.
1974</p>
1975</dd>
1976<dt class="hdlist1">
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1977--ignore-submodules[=&lt;when&gt;]
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1978</dt>
1979<dd>
1980<p>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1981 Ignore changes to submodules in the diff generation. &lt;when&gt; can be
Junio C Hamanoc7102962013-05-29 23:57:17[diff] [blame]1982 either "none", "untracked", "dirty" or "all", which is the default.
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1983 Using "none" will consider the submodule modified when it either contains
1984 untracked or modified files or its HEAD differs from the commit recorded
1985 in the superproject and can be used to override any settings of the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1986 <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]1987 "untracked" is used submodules are not considered dirty when they only
1988 contain untracked content (but they are still scanned for modified
1989 content). Using "dirty" ignores all changes to the work tree of submodules,
1990 only changes to the commits stored in the superproject are shown (this was
1991 the behavior until 1.7.0). Using "all" hides all changes to submodules.
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1992</p>
1993</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1994<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]1995--src-prefix=&lt;prefix&gt;
1996</dt>
1997<dd>
1998<p>
1999 Show the given source prefix instead of "a/".
2000</p>
2001</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2002<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]2003--dst-prefix=&lt;prefix&gt;
2004</dt>
2005<dd>
2006<p>
2007 Show the given destination prefix instead of "b/".
2008</p>
2009</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2010<dt class="hdlist1">
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]2011--no-prefix
2012</dt>
2013<dd>
2014<p>
2015 Do not show any source or destination prefix.
2016</p>
2017</dd>
Junio C Hamanocd451662016-09-13 00:54:09[diff] [blame]2018<dt class="hdlist1">
2019--line-prefix=&lt;prefix&gt;
2020</dt>
2021<dd>
2022<p>
2023 Prepend an additional prefix to every line of output.
2024</p>
2025</dd>
Junio C Hamanof7017f12016-10-27 23:31:34[diff] [blame]2026<dt class="hdlist1">
2027--ita-invisible-in-index
2028</dt>
2029<dd>
2030<p>
2031 By default entries added by "git add -N" appear as an existing
2032 empty file in "git diff" and a new file in "git diff --cached".
2033 This option makes the entry appear as a new file in "git diff"
2034 and non-existent in "git diff --cached". This option could be
2035 reverted with <code>--ita-visible-in-index</code>. Both options are
2036 experimental and could be removed in future.
2037</p>
2038</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2039</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2040<div class="paragraph"><p>For more detailed explanation on these common options, see also
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2041<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2042<div class="dlist"><dl>
2043<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2044-1 --base
2045</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2046<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2047-2 --ours
2048</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2049<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2050-3 --theirs
2051</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2052<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]2053-0
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2054</dt>
2055<dd>
2056<p>
2057 Diff against the "base" version, "our branch" or "their
2058 branch" respectively. With these options, diffs for
2059 merged entries are not shown.
2060</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2061<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]2062cleanly resolved paths. The option -0 can be given to
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2063omit diff output for unmerged entries and just show "Unmerged".</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2064</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2065<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]2066-c
2067</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2068<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]2069--cc
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2070</dt>
2071<dd>
2072<p>
2073 This compares stage 2 (our branch), stage 3 (their
2074 branch) and the working tree file and outputs a combined
2075 diff, similar to the way <em>diff-tree</em> shows a merge
2076 commit with these flags.
2077</p>
2078</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2079<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2080-q
2081</dt>
2082<dd>
2083<p>
Junio C Hamano51c2ab02006-07-09 20:38:54[diff] [blame]2084 Remain silent even on nonexistent files
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2085</p>
2086</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2087</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2088</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2089</div>
2090<div class="sect1">
Junio C Hamano543f8d62009-07-29 08:35:21[diff] [blame]2091<h2 id="_raw_output_format">Raw output format</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2092<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2093<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]2094"git-diff-files" and "git diff --raw" are very similar.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2095<div class="paragraph"><p>These commands all compare two sets of things; what is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2096compared differs:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2097<div class="dlist"><dl>
2098<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2099git-diff-index &lt;tree-ish&gt;
2100</dt>
2101<dd>
2102<p>
2103 compares the &lt;tree-ish&gt; and the files on the filesystem.
2104</p>
2105</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2106<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2107git-diff-index --cached &lt;tree-ish&gt;
2108</dt>
2109<dd>
2110<p>
2111 compares the &lt;tree-ish&gt; and the index.
2112</p>
2113</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2114<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2115git-diff-tree [-r] &lt;tree-ish-1&gt; &lt;tree-ish-2&gt; [&lt;pattern&gt;&#8230;]
2116</dt>
2117<dd>
2118<p>
2119 compares the trees named by the two arguments.
2120</p>
2121</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2122<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2123git-diff-files [&lt;pattern&gt;&#8230;]
2124</dt>
2125<dd>
2126<p>
2127 compares the index and the files on the filesystem.
2128</p>
2129</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2130</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2131<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]2132what is being compared. After that, all the commands print one output
2133line per changed file.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2134<div class="paragraph"><p>An output line is formatted this way:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2135<div class="listingblock">
2136<div class="content">
Junio C Hamanof2b280b2018-12-01 14:45:01[diff] [blame]2137<pre><code>in-place edit :100644 100644 bcd1234 0123456 M file0
2138copy-edit :100644 100644 abcd123 1234567 C68 file1 file2
2139rename-edit :100644 100644 abcd123 1234567 R86 file1 file3
2140create :000000 100644 0000000 1234567 A file4
2141delete :100644 000000 1234567 0000000 D file5
2142unmerged :000000 000000 0000000 0000000 U file6</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2143</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2144<div class="paragraph"><p>That is, from the left to the right:</p></div>
2145<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2146<li>
2147<p>
2148a colon.
2149</p>
2150</li>
2151<li>
2152<p>
2153mode for "src"; 000000 if creation or unmerged.
2154</p>
2155</li>
2156<li>
2157<p>
2158a space.
2159</p>
2160</li>
2161<li>
2162<p>
2163mode for "dst"; 000000 if deletion or unmerged.
2164</p>
2165</li>
2166<li>
2167<p>
2168a space.
2169</p>
2170</li>
2171<li>
2172<p>
2173sha1 for "src"; 0{40} if creation or unmerged.
2174</p>
2175</li>
2176<li>
2177<p>
2178a space.
2179</p>
2180</li>
2181<li>
2182<p>
Junio C Hamano7bc73592022-07-11 23:08:34[diff] [blame]2183sha1 for "dst"; 0{40} if deletion, unmerged or "work tree out of sync with the index".
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2184</p>
2185</li>
2186<li>
2187<p>
2188a space.
2189</p>
2190</li>
2191<li>
2192<p>
2193status, followed by optional "score" number.
2194</p>
2195</li>
2196<li>
2197<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2198a tab or a NUL when <code>-z</code> option is used.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2199</p>
2200</li>
2201<li>
2202<p>
2203path for "src"
2204</p>
2205</li>
2206<li>
2207<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2208a 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]2209</p>
2210</li>
2211<li>
2212<p>
2213path for "dst"; only exists for C or R.
2214</p>
2215</li>
2216<li>
2217<p>
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2218an 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]2219</p>
2220</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2221</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2222<div class="paragraph"><p>Possible status letters are:</p></div>
2223<div class="ulist"><ul>
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]2224<li>
2225<p>
2226A: addition of a file
2227</p>
2228</li>
2229<li>
2230<p>
2231C: copy of a file into a new one
2232</p>
2233</li>
2234<li>
2235<p>
2236D: deletion of a file
2237</p>
2238</li>
2239<li>
2240<p>
2241M: modification of the contents or mode of a file
2242</p>
2243</li>
2244<li>
2245<p>
2246R: renaming of a file
2247</p>
2248</li>
2249<li>
2250<p>
Junio C Hamano7b1585b2021-10-14 17:11:58[diff] [blame]2251T: change in the type of the file (regular file, symbolic link or submodule)
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]2252</p>
2253</li>
2254<li>
2255<p>
2256U: file is unmerged (you must complete the merge before it can
Junio C Hamano2f5a9892019-12-25 21:12:55[diff] [blame]2257 be committed)
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]2258</p>
2259</li>
2260<li>
2261<p>
2262X: "unknown" change type (most probably a bug, please report it)
2263</p>
2264</li>
2265</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2266<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]2267percentage of similarity between the source and target of the move or
Junio C Hamano6bb32e62015-02-17 22:11:26[diff] [blame]2268copy). Status letter M may be followed by a score (denoting the
2269percentage of dissimilarity) for file rewrites.</p></div>
Junio C Hamano7bc73592022-07-11 23:08:34[diff] [blame]2270<div class="paragraph"><p>The sha1 for "dst" is shown as all 0&#8217;s if a file on the filesystem
2271is out of sync with the index.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2272<div class="paragraph"><p>Example:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2273<div class="listingblock">
2274<div class="content">
Junio C Hamanof2b280b2018-12-01 14:45:01[diff] [blame]2275<pre><code>:100644 100644 5be4a4a 0000000 M file.c</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2276</div></div>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]2277<div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
2278quoted as explained for the configuration variable <code>core.quotePath</code>
2279(see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
2280verbatim and the line is terminated by a NUL byte.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2281</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2282</div>
2283<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2284<h2 id="_diff_format_for_merges">diff format for merges</h2>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2285<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2286<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]2287can take <code>-c</code> or <code>--cc</code> option
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2288to generate diff output also for merge commits. The output differs
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2289from the format described above in the following way:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2290<div class="olist arabic"><ol class="arabic">
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2291<li>
2292<p>
2293there is a colon for each parent
2294</p>
2295</li>
2296<li>
2297<p>
2298there are more "src" modes and "src" sha1
2299</p>
2300</li>
2301<li>
2302<p>
2303status is concatenated status characters for each parent
2304</p>
2305</li>
2306<li>
2307<p>
2308no optional "score" number
2309</p>
2310</li>
2311<li>
2312<p>
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2313tab-separated pathname(s) of the file
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2314</p>
2315</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2316</ol></div>
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2317<div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
2318if the file was renamed on any side of history. With
2319<code>--combined-all-paths</code>, the name of the path in each parent is shown
2320followed by the name of the path in the merge commit.</p></div>
2321<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]2322<div class="listingblock">
2323<div class="content">
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2324<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c
2325::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
2326::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c</code></pre>
2327</div></div>
2328<div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
2329<div class="listingblock">
2330<div class="content">
2331<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c desc.c desc.c
2332::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM foo.sh bar.sh bar.sh
2333::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]2334</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2335<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]2336all parents.</p></div>
Junio C Hamano67fad6d2007-05-06 08:53:12[diff] [blame]2337</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2338</div>
2339<div class="sect1">
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2340<h2 id="_generating_patch_text_with_p">Generating patch text with -p</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2341<div class="sectionbody">
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2342<div class="paragraph"><p>Running
2343<a href="git-diff.html">git-diff(1)</a>,
2344<a href="git-log.html">git-log(1)</a>,
2345<a href="git-show.html">git-show(1)</a>,
2346<a href="git-diff-index.html">git-diff-index(1)</a>,
2347<a href="git-diff-tree.html">git-diff-tree(1)</a>, or
2348<a href="git-diff-files.html">git-diff-files(1)</a>
2349with the <code>-p</code> option produces patch text.
2350You can customize the creation of patch text via the
Junio C Hamano558abd22020-09-03 20:22:34[diff] [blame]2351<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables
Junio C Hamanobe601db2021-05-07 04:20:28[diff] [blame]2352(see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2353<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]2354diff format:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2355<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2356<li>
2357<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2358It is preceded with a "git diff" header that looks like this:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2359</p>
2360<div class="literalblock">
2361<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2362<pre><code>diff --git a/file1 b/file2</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2363</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2364<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]2365involved. Especially, even for a creation or a deletion,
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2366<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
2367<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]2368name of the source file of the rename/copy and the name of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2369the file that rename/copy produces, respectively.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2370</li>
2371<li>
2372<p>
2373It is followed by one or more extended header lines:
2374</p>
2375<div class="literalblock">
2376<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2377<pre><code>old mode &lt;mode&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2378new mode &lt;mode&gt;
2379deleted file mode &lt;mode&gt;
2380new file mode &lt;mode&gt;
2381copy from &lt;path&gt;
2382copy to &lt;path&gt;
2383rename from &lt;path&gt;
2384rename to &lt;path&gt;
2385similarity index &lt;number&gt;
2386dissimilarity index &lt;number&gt;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2387index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2388</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2389<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]2390and file permission bits.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2391<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]2392<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2393the dissimilarity index is the percentage of changed lines. It
2394is a rounded down integer, followed by a percent sign. The
2395similarity index value of 100% is thus reserved for two equal
2396files, while 100% dissimilarity means that no line from the old
2397file made it into the new one.</p></div>
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2398<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]2399The &lt;mode&gt; is included if the file mode does not change; otherwise,
2400separate lines indicate the old and the new mode.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2401</li>
2402<li>
2403<p>
Junio C Hamano0f6f3bf2017-03-13 07:01:53[diff] [blame]2404Pathnames with "unusual" characters are quoted as explained for
2405 the configuration variable <code>core.quotePath</code> (see
2406 <a href="git-config.html">git-config(1)</a>).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2407</p>
2408</li>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2409<li>
2410<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2411All the <code>file1</code> files in the output refer to files before the
2412 commit, and all the <code>file2</code> files refer to files after the commit.
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2413 It is incorrect to apply each change to each file sequentially. For
2414 example, this patch will swap a and b:
2415</p>
2416<div class="literalblock">
2417<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2418<pre><code>diff --git a/a b/b
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2419rename from a
2420rename to b
2421diff --git a/b b/a
2422rename from b
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2423rename to a</code></pre>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]2424</div></div>
2425</li>
Junio C Hamanobe601db2021-05-07 04:20:28[diff] [blame]2426<li>
2427<p>
2428Hunk headers mention the name of the function to which the hunk
2429 applies. See "Defining a custom hunk-header" in
2430 <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
2431 specific languages.
2432</p>
2433</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2434</ol></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2435</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2436</div>
2437<div class="sect1">
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2438<h2 id="_combined_diff_format">Combined diff format</h2>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2439<div class="sectionbody">
Junio C Hamano1dbca522015-05-22 20:48:55[diff] [blame]2440<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]2441produce a <em>combined diff</em> when showing a merge. This is the default
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2442format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
Junio C Hamano8c860d62021-02-06 01:37:47[diff] [blame]2443<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
2444<code>--diff-merges</code> option to any of these commands to force generation of
2445diffs in specific format.</p></div>
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2446<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2447<div class="listingblock">
2448<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2449<pre><code>diff --combined describe.c
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2450index fabadb8,cc95eb0..4866510
2451--- a/describe.c
2452+++ b/describe.c
2453@@@ -98,20 -98,12 +98,20 @@@
2454 return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2455 }
2456
2457- static void describe(char *arg)
2458 -static void describe(struct commit *cmit, int last_one)
2459++static void describe(char *arg, int last_one)
2460 {
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2461 + unsigned char sha1[20];
2462 + struct commit *cmit;
2463 struct commit_list *list;
2464 static int initialized = 0;
2465 struct commit_name *n;
2466
2467 + if (get_sha1(arg, sha1) &lt; 0)
2468 + usage(describe_usage);
2469 + cmit = lookup_commit_reference(sha1);
2470 + if (!cmit)
2471 + usage(describe_usage);
2472 +
2473 if (!initialized) {
2474 initialized = 1;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2475 for_each_ref(get_name);</code></pre>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2476</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2477<div class="olist arabic"><ol class="arabic">
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2478<li>
2479<p>
2480It is preceded with a "git diff" header, that looks like
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2481 this (when the <code>-c</code> option is used):
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2482</p>
2483<div class="literalblock">
2484<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2485<pre><code>diff --combined file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2486</div></div>
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2487<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]2488<div class="literalblock">
2489<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2490<pre><code>diff --cc file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2491</div></div>
2492</li>
2493<li>
2494<p>
2495It is followed by one or more extended header lines
2496 (this example shows a merge with two parents):
2497</p>
2498<div class="literalblock">
2499<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2500<pre><code>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2501mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
2502new file mode &lt;mode&gt;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2503deleted file mode &lt;mode&gt;,&lt;mode&gt;</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2504</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2505<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]2506the &lt;mode&gt; is different from the rest. Extended headers with
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2507information about detected contents movement (renames and
2508copying detection) are designed to work with diff of two
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2509&lt;tree-ish&gt; and are not used by combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2510</li>
2511<li>
2512<p>
2513It is followed by two-line from-file/to-file header
2514</p>
2515<div class="literalblock">
2516<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2517<pre><code>--- a/file
2518+++ b/file</code></pre>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2519</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2520<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]2521format, <code>/dev/null</code> is used to signal created or deleted
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2522files.</p></div>
Junio C Hamano11f15372019-03-07 03:17:00[diff] [blame]2523<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
2524two-line from-file/to-file you get a N+1 line from-file/to-file header,
2525where N is the number of parents in the merge commit</p></div>
2526<div class="literalblock">
2527<div class="content">
2528<pre><code>--- a/file
2529--- a/file
2530--- a/file
2531+++ b/file</code></pre>
2532</div></div>
2533<div class="paragraph"><p>This extended format can be useful if rename or copy detection is
2534active, to allow you to see the original name of the file in different
2535parents.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2536</li>
2537<li>
2538<p>
2539Chunk header format is modified to prevent people from
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2540 accidentally feeding it to <code>patch -p1</code>. Combined diff format
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2541 was created for review of merge commit changes, and was not
Junio C Hamano48cd3f12019-10-09 05:55:30[diff] [blame]2542 meant to be applied. The change is similar to the change in the
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2543 extended <em>index</em> header:
2544</p>
2545<div class="literalblock">
2546<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2547<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]2548</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2549<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]2550header for combined diff format.</p></div>
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2551</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2552</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2553<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]2554files 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
2555added to B), or <code>" "</code> (space&#8201;&#8212;&#8201;unchanged) prefix, this format
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2556compares two or more files file1, file2,&#8230; with one file X, and
2557shows how X differs from each of fileN. One column for each of
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2558fileN is prepended to the output line to note how X&#8217;s line is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2559different from it.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2560<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
2561fileN but it does not appear in the result. A <code>+</code> character
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]2562in the column N means that the line appears in the result,
Junio C Hamano29f14312006-10-26 08:47:29[diff] [blame]2563and fileN does not have that line (in other words, the line was
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2564added, from the point of view of that parent).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2565<div class="paragraph"><p>In the above example output, the function signature was changed
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2566from both files (hence two <code>-</code> removals from both file1 and
2567file2, plus <code>++</code> to mean one line that was added does not appear
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]2568in either file1 or file2). Also eight other lines are the same
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2569from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
2570<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]2571merge commit with the merge result (i.e. file1..fileN are the
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2572parents). When shown by <code>git diff-files -c</code>, it compares the
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2573two unresolved merge parents with the working tree file
2574(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2575"their version").</p></div>
Junio C Hamanofb56a962006-01-28 10:38:19[diff] [blame]2576</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2577</div>
2578<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2579<h2 id="_other_diff_formats">other diff formats</h2>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2580<div class="sectionbody">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2581<div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
2582copied files. The <code>--stat</code> option adds diffstat(1) graph to the
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2583output. These options can be combined with other options, such as
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2584<code>-p</code>, and are meant for human consumption.</p></div>
2585<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]2586formats the pathnames compactly by combining common prefix and suffix of
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2587the pathnames. For example, a change that moves <code>arch/i386/Makefile</code> to
2588<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]2589<div class="listingblock">
2590<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2591<pre><code>arch/{i386 =&gt; x86}/Makefile | 4 +--</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2592</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2593<div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
2594for easier machine consumption. An entry in <code>--numstat</code> output looks
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2595like this:</p></div>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2596<div class="listingblock">
2597<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2598<pre><code>1 2 README
25993 1 arch/{i386 =&gt; x86}/Makefile</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2600</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2601<div class="paragraph"><p>That is, from left to right:</p></div>
2602<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2603<li>
2604<p>
2605the number of added lines;
2606</p>
2607</li>
2608<li>
2609<p>
2610a tab;
2611</p>
2612</li>
2613<li>
2614<p>
2615the number of deleted lines;
2616</p>
2617</li>
2618<li>
2619<p>
2620a tab;
2621</p>
2622</li>
2623<li>
2624<p>
2625pathname (possibly with rename/copy information);
2626</p>
2627</li>
2628<li>
2629<p>
2630a newline.
2631</p>
2632</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2633</ol></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2634<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]2635<div class="listingblock">
2636<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2637<pre><code>1 2 README NUL
26383 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</code></pre>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2639</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2640<div class="paragraph"><p>That is:</p></div>
2641<div class="olist arabic"><ol class="arabic">
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]2642<li>
2643<p>
2644the number of added lines;
2645</p>
2646</li>
2647<li>
2648<p>
2649a tab;
2650</p>
2651</li>
2652<li>
2653<p>
2654the number of deleted lines;
2655</p>
2656</li>
2657<li>
2658<p>
2659a tab;
2660</p>
2661</li>
2662<li>
2663<p>
2664a NUL (only exists if renamed/copied);
2665</p>
2666</li>
2667<li>
2668<p>
2669pathname in preimage;
2670</p>
2671</li>
2672<li>
2673<p>
2674a NUL (only exists if renamed/copied);
2675</p>
2676</li>
2677<li>
2678<p>
2679pathname in postimage (only exists if renamed/copied);
2680</p>
2681</li>
2682<li>
2683<p>
2684a NUL.
2685</p>
2686</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2687</ol></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2688<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]2689scripts that read the output to tell if the current record being read is
2690a single-path record or a rename/copy record without reading ahead.
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]2691After reading added and deleted lines, reading up to <code>NUL</code> would yield
2692the 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]2693</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2694</div>
2695<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2696<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2697<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2698<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]2699</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]2700</div>
Junio C Hamano9629d4f2012-12-19 00:28:27[diff] [blame]2701</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]2702<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2703<div id="footer">
2704<div id="footer-text">
Junio C Hamano2ef0ba32018-01-26 23:13:53[diff] [blame]2705Last updated
Junio C Hamanocf9c7732022-10-28 18:56:06[diff] [blame^]2706 2022-10-28 11:53:56 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]2707</div>
2708</div>
2709</body>
2710</html>