Google Git
Sign in
chromium / external / gitster / git-htmldocs / 7f7e6a47a4543fc8b8335e64746e0f7e3ce80f4a / . / git-range-diff.html
blob: 8d340b76cfc5f4794802f018480eeed56995d988 [file] [log] [blame]
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]1<!DOCTYPE html>
2<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
3<head>
4<meta charset="UTF-8"/>
5<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
6<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
7<meta name="generator" content="Asciidoctor 2.0.20"/>
8<title>git-range-diff(1)</title>
9<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"/>
10<style>
11/*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
12/* Uncomment the following line when using as a custom stylesheet */
13/* @import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"; */
14html{font-family:sans-serif;-webkit-text-size-adjust:100%}
15a{background:none}
16a:focus{outline:thin dotted}
17a:active,a:hover{outline:0}
18h1{font-size:2em;margin:.67em 0}
19b,strong{font-weight:bold}
20abbr{font-size:.9em}
21abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none}
22dfn{font-style:italic}
23hr{height:0}
24mark{background:#ff0;color:#000}
25code,kbd,pre,samp{font-family:monospace;font-size:1em}
26pre{white-space:pre-wrap}
27q{quotes:"\201C" "\201D" "\2018" "\2019"}
28small{font-size:80%}
29sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
30sup{top:-.5em}
31sub{bottom:-.25em}
32img{border:0}
33svg:not(:root){overflow:hidden}
34figure{margin:0}
35audio,video{display:inline-block}
36audio:not([controls]){display:none;height:0}
37fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
38legend{border:0;padding:0}
39button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
40button,input{line-height:normal}
41button,select{text-transform:none}
42button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
43button[disabled],html input[disabled]{cursor:default}
44input[type=checkbox],input[type=radio]{padding:0}
45button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
46textarea{overflow:auto;vertical-align:top}
47table{border-collapse:collapse;border-spacing:0}
48*,::before,::after{box-sizing:border-box}
49html,body{font-size:100%}
50body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
51a:hover{cursor:pointer}
52img,object,embed{max-width:100%;height:auto}
53object,embed{height:100%}
54img{-ms-interpolation-mode:bicubic}
55.left{float:left!important}
56.right{float:right!important}
57.text-left{text-align:left!important}
58.text-right{text-align:right!important}
59.text-center{text-align:center!important}
60.text-justify{text-align:justify!important}
61.hide{display:none}
62img,object,svg{display:inline-block;vertical-align:middle}
63textarea{height:auto;min-height:50px}
64select{width:100%}
65.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
66div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
67a{color:#2156a5;text-decoration:underline;line-height:inherit}
68a:hover,a:focus{color:#1d4b8f}
69a img{border:0}
70p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
71p aside{font-size:.875em;line-height:1.35;font-style:italic}
72h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
73h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
74h1{font-size:2.125em}
75h2{font-size:1.6875em}
76h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
77h4,h5{font-size:1.125em}
78h6{font-size:1em}
79hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em}
80em,i{font-style:italic;line-height:inherit}
81strong,b{font-weight:bold;line-height:inherit}
82small{font-size:60%;line-height:inherit}
83code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
84ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
85ul,ol{margin-left:1.5em}
86ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
87ul.circle{list-style-type:circle}
88ul.disc{list-style-type:disc}
89ul.square{list-style-type:square}
90ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
91ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
92dl dt{margin-bottom:.3125em;font-weight:bold}
93dl dd{margin-bottom:1.25em}
94blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
95blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
96@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
97h1{font-size:2.75em}
98h2{font-size:2.3125em}
99h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
100h4{font-size:1.4375em}}
101table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal}
102table thead,table tfoot{background:#f7f8f7}
103table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
104table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
105table tr.even,table tr.alt{background:#f8f8f7}
106table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
107h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
108h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
109.center{margin-left:auto;margin-right:auto}
110.stretch{width:100%}
111.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
112.clearfix::after,.float-group::after{clear:both}
113:not(pre).nobreak{word-wrap:normal}
114:not(pre).nowrap{white-space:nowrap}
115:not(pre).pre-wrap{white-space:pre-wrap}
116:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
117pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
118pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
119pre>code{display:block}
120pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
121em em{font-style:normal}
122strong strong{font-weight:400}
123.keyseq{color:rgba(51,51,51,.8)}
124kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 0 rgba(0,0,0,.2),inset 0 0 0 .1em #fff;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
125.keyseq kbd:first-child{margin-left:0}
126.keyseq kbd:last-child{margin-right:0}
127.menuseq,.menuref{color:#000}
128.menuseq b:not(.caret),.menuref{font-weight:inherit}
129.menuseq{word-spacing:-.02em}
130.menuseq b.caret{font-size:1.25em;line-height:.8}
131.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
132b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
133b.button::before{content:"[";padding:0 3px 0 2px}
134b.button::after{content:"]";padding:0 2px 0 3px}
135p a>code:hover{color:rgba(0,0,0,.9)}
136#header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
137#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
138#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
139#content{margin-top:1.25em}
140#content::before{content:none}
141#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
142#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
143#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
144#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:flex;flex-flow:row wrap}
145#header .details span:first-child{margin-left:-.125em}
146#header .details span.email a{color:rgba(0,0,0,.85)}
147#header .details br{display:none}
148#header .details br+span::before{content:"\00a0\2013\00a0"}
149#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
150#header .details br+span#revremark::before{content:"\00a0|\00a0"}
151#header #revnumber{text-transform:capitalize}
152#header #revnumber::after{content:"\00a0"}
153#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
154#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
155#toc>ul{margin-left:.125em}
156#toc ul.sectlevel0>li>a{font-style:italic}
157#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
158#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
159#toc li{line-height:1.3334;margin-top:.3334em}
160#toc a{text-decoration:none}
161#toc a:active{text-decoration:underline}
162#toctitle{color:#7a2518;font-size:1.2em}
163@media screen and (min-width:768px){#toctitle{font-size:1.375em}
164body.toc2{padding-left:15em;padding-right:0}
165#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
166#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
167#toc.toc2>ul{font-size:.9em;margin-bottom:0}
168#toc.toc2 ul ul{margin-left:0;padding-left:1em}
169#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
170body.toc2.toc-right{padding-left:0;padding-right:15em}
171body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
172@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
173#toc.toc2{width:20em}
174#toc.toc2 #toctitle{font-size:1.375em}
175#toc.toc2>ul{font-size:.95em}
176#toc.toc2 ul ul{padding-left:1.25em}
177body.toc2.toc-right{padding-left:0;padding-right:20em}}
178#content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px}
179#content #toc>:first-child{margin-top:0}
180#content #toc>:last-child{margin-bottom:0}
181#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
182#footer-text{color:hsla(0,0%,100%,.8);line-height:1.44}
183#content{margin-bottom:.625em}
184.sect1{padding-bottom:.625em}
185@media screen and (min-width:768px){#content{margin-bottom:1.25em}
186.sect1{padding-bottom:1.25em}}
187.sect1:last-child{padding-bottom:0}
188.sect1+.sect1{border-top:1px solid #e7e7e9}
189#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
190#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
191#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
192#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
193#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
194details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
195details{margin-left:1.25rem}
196details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent}
197details>summary::-webkit-details-marker{display:none}
198details>summary::before{content:"";border:solid transparent;border-left:solid;border-width:.3em 0 .3em .5em;position:absolute;top:.5em;left:-1.25rem;transform:translateX(15%)}
199details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)}
200details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem}
201.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
202table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
203.paragraph.lead>p,#preamble>.sectionbody>[class=paragraph]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
204.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
205.admonitionblock>table td.icon{text-align:center;width:80px}
206.admonitionblock>table td.icon img{max-width:none}
207.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
208.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
209.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
210.exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px}
211.sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px}
212.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
213.exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0}
214.exampleblock>.content>:last-child,.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
215.literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
216@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
217@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
218.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
219.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
220.listingblock>.content{position:relative}
221.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
222.listingblock:hover code[data-lang]::before{display:block}
223.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
224.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
225.listingblock pre.highlightjs{padding:0}
226.listingblock pre.highlightjs>code{padding:1em;border-radius:4px}
227.listingblock pre.prettyprint{border-width:0}
228.prettyprint{background:#f7f7f8}
229pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
230pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
231pre.prettyprint li code[data-lang]::before{opacity:1}
232pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
233table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
234table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
235table.linenotable td.code{padding-left:.75em}
236table.linenotable td.linenos,pre.pygments .linenos{border-right:1px solid;opacity:.35;padding-right:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
237pre.pygments span.linenos{display:inline-block;margin-right:.75em}
238.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
239.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
240.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
241.quoteblock blockquote{margin:0;padding:0;border:0}
242.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
243.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
244.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
245.verseblock{margin:0 1em 1.25em}
246.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans-serif;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
247.verseblock pre strong{font-weight:400}
248.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
249.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
250.quoteblock .attribution br,.verseblock .attribution br{display:none}
251.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
252.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
253.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
254.quoteblock.abstract{margin:0 1em 1.25em;display:block}
255.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
256.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
257.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
258.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
259.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
260p.tableblock:last-child{margin-bottom:0}
261td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
262td.tableblock>.content>:last-child{margin-bottom:-1.25em}
263table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
264table.grid-all>*>tr>*{border-width:1px}
265table.grid-cols>*>tr>*{border-width:0 1px}
266table.grid-rows>*>tr>*{border-width:1px 0}
267table.frame-all{border-width:1px}
268table.frame-ends{border-width:1px 0}
269table.frame-sides{border-width:0 1px}
270table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
271table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
272table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
273table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
274table.stripes-all>*>tr,table.stripes-odd>*>tr:nth-of-type(odd),table.stripes-even>*>tr:nth-of-type(even),table.stripes-hover>*>tr:hover{background:#f8f8f7}
275th.halign-left,td.halign-left{text-align:left}
276th.halign-right,td.halign-right{text-align:right}
277th.halign-center,td.halign-center{text-align:center}
278th.valign-top,td.valign-top{vertical-align:top}
279th.valign-bottom,td.valign-bottom{vertical-align:bottom}
280th.valign-middle,td.valign-middle{vertical-align:middle}
281table thead th,table tfoot th{font-weight:bold}
282tbody tr th{background:#f7f8f7}
283tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
284p.tableblock>code:only-child{background:none;padding:0}
285p.tableblock{font-size:1em}
286ol{margin-left:1.75em}
287ul li ol{margin-left:1.5em}
288dl dd{margin-left:1.125em}
289dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
290li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
291ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
292ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
293ul.unstyled,ol.unstyled{margin-left:0}
294li>p:empty:only-child::before{content:"";display:inline-block}
295ul.checklist>li>p:first-child{margin-left:-1em}
296ul.checklist>li>p:first-child>.fa-square-o:first-child,ul.checklist>li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
297ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em}
298ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
299ul.inline>li{margin-left:1.25em}
300.unstyled dl dt{font-weight:400;font-style:normal}
301ol.arabic{list-style-type:decimal}
302ol.decimal{list-style-type:decimal-leading-zero}
303ol.loweralpha{list-style-type:lower-alpha}
304ol.upperalpha{list-style-type:upper-alpha}
305ol.lowerroman{list-style-type:lower-roman}
306ol.upperroman{list-style-type:upper-roman}
307ol.lowergreek{list-style-type:lower-greek}
308.hdlist>table,.colist>table{border:0;background:none}
309.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
310td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
311td.hdlist1{font-weight:bold;padding-bottom:1.25em}
312td.hdlist2{word-wrap:anywhere}
313.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
314.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
315.colist td:not([class]):first-child img{max-width:none}
316.colist td:not([class]):last-child{padding:.25em 0}
317.thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd}
318.imageblock.left{margin:.25em .625em 1.25em 0}
319.imageblock.right{margin:.25em 0 1.25em .625em}
320.imageblock>.title{margin-bottom:0}
321.imageblock.thumb,.imageblock.th{border-width:6px}
322.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
323.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
324.image.left{margin-right:.625em}
325.image.right{margin-left:.625em}
326a.image{text-decoration:none;display:inline-block}
327a.image object{pointer-events:none}
328sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
329sup.footnote a,sup.footnoteref a{text-decoration:none}
330sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
331#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
332#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
333#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
334#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
335#footnotes .footnote:last-of-type{margin-bottom:0}
336#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
337div.unbreakable{page-break-inside:avoid}
338.big{font-size:larger}
339.small{font-size:smaller}
340.underline{text-decoration:underline}
341.overline{text-decoration:overline}
342.line-through{text-decoration:line-through}
343.aqua{color:#00bfbf}
344.aqua-background{background:#00fafa}
345.black{color:#000}
346.black-background{background:#000}
347.blue{color:#0000bf}
348.blue-background{background:#0000fa}
349.fuchsia{color:#bf00bf}
350.fuchsia-background{background:#fa00fa}
351.gray{color:#606060}
352.gray-background{background:#7d7d7d}
353.green{color:#006000}
354.green-background{background:#007d00}
355.lime{color:#00bf00}
356.lime-background{background:#00fa00}
357.maroon{color:#600000}
358.maroon-background{background:#7d0000}
359.navy{color:#000060}
360.navy-background{background:#00007d}
361.olive{color:#606000}
362.olive-background{background:#7d7d00}
363.purple{color:#600060}
364.purple-background{background:#7d007d}
365.red{color:#bf0000}
366.red-background{background:#fa0000}
367.silver{color:#909090}
368.silver-background{background:#bcbcbc}
369.teal{color:#006060}
370.teal-background{background:#007d7d}
371.white{color:#bfbfbf}
372.white-background{background:#fafafa}
373.yellow{color:#bfbf00}
374.yellow-background{background:#fafa00}
375span.icon>.fa{cursor:default}
376a span.icon>.fa{cursor:inherit}
377.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
378.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
379.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
380.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
381.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
382.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
383.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
384.conum[data-value] *{color:#fff!important}
385.conum[data-value]+b{display:none}
386.conum[data-value]::after{content:attr(data-value)}
387pre .conum[data-value]{position:relative;top:-.125em}
388b.conum *{color:inherit!important}
389.conum:not([data-value]):empty{display:none}
390dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
391h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em}
392p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
393p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem}
394p{margin-bottom:1.25rem}
395.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
396.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc}
397.print-only{display:none!important}
398@page{margin:1.25cm .75cm}
399@media print{*{box-shadow:none!important;text-shadow:none!important}
400html{font-size:80%}
401a{color:inherit!important;text-decoration:underline!important}
402a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
403a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
404abbr[title]{border-bottom:1px dotted}
405abbr[title]::after{content:" (" attr(title) ")"}
406pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
407thead{display:table-header-group}
408svg{max-width:100%}
409p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
410h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
411#header,#content,#footnotes,#footer{max-width:none}
412#toc,.sidebarblock,.exampleblock>.content{background:none!important}
413#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
414body.book #header{text-align:center}
415body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
416body.book #header .details{border:0!important;display:block;padding:0!important}
417body.book #header .details span:first-child{margin-left:0!important}
418body.book #header .details br{display:block}
419body.book #header .details br+span::before{content:none!important}
420body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
421body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
422.listingblock code[data-lang]::before{display:block}
423#footer{padding:0 .9375em}
424.hide-on-print{display:none!important}
425.print-only{display:block!important}
426.hide-for-print{display:none!important}
427.show-for-print{display:inherit!important}}
428@media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem}
429.sect1{padding:0!important}
430.sect1+.sect1{border:0}
431#footer{background:none}
432#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
433@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
434</style>
435<style>
436pre>code {
437 display: inline;
438}
439</style>
440</head>
441<body class="manpage">
442<div id="header">
443<h1>git-range-diff(1) Manual Page</h1>
444<h2 id="_name">NAME</h2>
445<div class="sectionbody">
446<p>git-range-diff - Compare two commit ranges (e.g. two versions of a branch)</p>
447</div>
448</div>
449<div id="content">
450<div class="sect1">
451<h2 id="_synopsis">SYNOPSIS</h2>
452<div class="sectionbody">
453<div class="verseblock">
454<pre class="content"><em>git range-diff</em> [--color=[&lt;when&gt;]] [--no-color] [&lt;diff-options&gt;]
455 [--no-dual-color] [--creation-factor=&lt;factor&gt;]
456 [--left-only | --right-only]
457 ( &lt;range1&gt; &lt;range2&gt; | &lt;rev1&gt;&#8230;&#8203;&lt;rev2&gt; | &lt;base&gt; &lt;rev1&gt; &lt;rev2&gt; )
458 [[--] &lt;path&gt;&#8230;&#8203;]</pre>
459</div>
460</div>
461</div>
462<div class="sect1">
463<h2 id="_description">DESCRIPTION</h2>
464<div class="sectionbody">
465<div class="paragraph">
466<p>This command shows the differences between two versions of a patch
467series, or more generally, two commit ranges (ignoring merge commits).</p>
468</div>
469<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]470<p>In the presence of <em>&lt;path&gt;</em> arguments, these commit ranges are limited
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]471accordingly.</p>
472</div>
473<div class="paragraph">
474<p>To that end, it first finds pairs of commits from both commit ranges
475that correspond with each other. Two commits are said to correspond when
476the diff between their patches (i.e. the author information, the commit
477message and the commit diff) is reasonably small compared to the
478patches' size. See ``Algorithm`` below for details.</p>
479</div>
480<div class="paragraph">
481<p>Finally, the list of matching commits is shown in the order of the
482second commit range, with unmatched commits being inserted just after
483all of their ancestors have been shown.</p>
484</div>
485<div class="paragraph">
486<p>There are three ways to specify the commit ranges:</p>
487</div>
488<div class="ulist">
489<ul>
490<li>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]491<p><em>&lt;range1&gt;</em> <em>&lt;range2&gt;</em>: Either commit range can be of the form
492<em>&lt;base&gt;</em><code>..</code><em>&lt;rev&gt;</em>, <em>&lt;rev&gt;</em><code>^</code>! or <em>&lt;rev&gt;</em><code>^-</code><em>&lt;n&gt;</em>. See <code>SPECIFYING</code> <code>RANGES</code>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]493in <a href="gitrevisions.html">gitrevisions(7)</a> for more details.</p>
494</li>
495<li>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]496<p><em>&lt;rev1&gt;</em><code>...</code><em>&lt;rev2&gt;</em>. This is equivalent to
497<em>&lt;rev2&gt;</em><code>..</code><em>&lt;rev1&gt;</em> <em>&lt;rev1&gt;</em><code>..</code><em>&lt;rev2&gt;</em>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]498</li>
499<li>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]500<p><em>&lt;base&gt;</em> <em>&lt;rev1&gt;</em> <em>&lt;rev2&gt;</em>: This is equivalent to <em>&lt;base&gt;</em><code>..</code><em>&lt;rev1&gt;</em>
501<em>&lt;base&gt;</em><code>..</code><em>&lt;rev2&gt;</em>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]502</li>
503</ul>
504</div>
505</div>
506</div>
507<div class="sect1">
508<h2 id="_options">OPTIONS</h2>
509<div class="sectionbody">
510<div class="dlist">
511<dl>
512<dt class="hdlist1">--no-dual-color</dt>
513<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]514<p>When the commit diffs differ, <code>git</code> <code>range-diff</code> recreates the
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]515original diffs' coloring, and adds outer -/+ diff markers with
516the <strong>background</strong> being red/green to make it easier to see e.g.
517when there was a change in what exact lines were added.</p>
518<div class="paragraph">
519<p>Additionally, the commit diff lines that are only present in the first commit
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]520range are shown "dimmed" (this can be overridden using the <code>color.diff.</code><em>&lt;slot&gt;</em>
521config setting where <em>&lt;slot&gt;</em> is one of <code>contextDimmed</code>, <code>oldDimmed</code> and
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]522<code>newDimmed</code>), and the commit diff lines that are only present in the second
523commit range are shown in bold (which can be overridden using the config
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]524settings <code>color.diff.</code><em>&lt;slot&gt;</em> with <em>&lt;slot&gt;</em> being one of <code>contextBold</code>,
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]525<code>oldBold</code> or <code>newBold</code>).</p>
526</div>
527<div class="paragraph">
528<p>This is known to <code>range-diff</code> as "dual coloring". Use <code>--no-dual-color</code>
529to revert to color all lines according to the outer diff markers
530(and completely ignore the inner diff when it comes to color).</p>
531</div>
532</dd>
533<dt class="hdlist1">--creation-factor=&lt;percent&gt;</dt>
534<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]535<p>Set the creation/deletion cost fudge factor to <em>&lt;percent&gt;</em>.
536Defaults to 60. Try a larger value if <code>git</code> <code>range-diff</code> erroneously
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]537considers a large change a total rewrite (deletion of one commit
538and addition of another), and a smaller one in the reverse case.
539See the ``Algorithm`` section below for an explanation of why this is
540needed.</p>
541</dd>
542<dt class="hdlist1">--left-only</dt>
543<dd>
544<p>Suppress commits that are missing from the first specified range
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]545(or the "left range" when using the <em>&lt;rev1&gt;</em><code>...</code><em>&lt;rev2&gt;</em> format).</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]546</dd>
547<dt class="hdlist1">--right-only</dt>
548<dd>
549<p>Suppress commits that are missing from the second specified range
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]550(or the "right range" when using the <em>&lt;rev1&gt;</em><code>...</code><em>&lt;rev2&gt;</em> format).</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]551</dd>
552<dt class="hdlist1">--[no-]notes[=&lt;ref&gt;]</dt>
553<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]554<p>This flag is passed to the <code>git</code> <code>log</code> program
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]555(see <a href="git-log.html">git-log(1)</a>) that generates the patches.</p>
556</dd>
557<dt class="hdlist1">&lt;range1&gt; &lt;range2&gt;</dt>
558<dd>
559<p>Compare the commits specified by the two ranges, where
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]560<em>&lt;range1&gt;</em> is considered an older version of <em>&lt;range2&gt;</em>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]561</dd>
562<dt class="hdlist1">&lt;rev1&gt;&#8230;&#8203;&lt;rev2&gt;</dt>
563<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]564<p>Equivalent to passing <em>&lt;rev2&gt;</em><code>..</code><em>&lt;rev1&gt;</em> and <em>&lt;rev1&gt;</em><code>..</code><em>&lt;rev2&gt;</em>.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]565</dd>
566<dt class="hdlist1">&lt;base&gt; &lt;rev1&gt; &lt;rev2&gt;</dt>
567<dd>
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]568<p>Equivalent to passing <em>&lt;base&gt;</em><code>..</code><em>&lt;rev1&gt;</em> and <em>&lt;base&gt;</em><code>..</code><em>&lt;rev2&gt;</em>.
569Note that <em>&lt;base&gt;</em> does not need to be the exact branch point
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]570of the branches. Example: after rebasing a branch <code>my-topic</code>,
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]571<code>git</code> <code>range-diff</code> <code>my-topic@</code>{u} <code>my-topic@</code>{1} <code>my-topic</code> would
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]572show the differences introduced by the rebase.</p>
573</dd>
574</dl>
575</div>
576<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]577<p><code>git</code> <code>range-diff</code> also accepts the regular diff options (see
578<a href="git-diff.html">git-diff(1)</a>), most notably the <code>--color=</code>[<em>&lt;when&gt;</em>] and
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]579<code>--no-color</code> options. These options are used when generating the "diff
580between patches", i.e. to compare the author, commit message and diff of
581corresponding old/new commits. There is currently no means to tweak most of the
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]582diff options passed to <code>git</code> <code>log</code> when generating those patches.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]583</div>
584</div>
585</div>
586<div class="sect1">
587<h2 id="_output_stability">OUTPUT STABILITY</h2>
588<div class="sectionbody">
589<div class="paragraph">
590<p>The output of the <code>range-diff</code> command is subject to change. It is
591intended to be human-readable porcelain output, not something that can
592be used across versions of Git to get a textually stable <code>range-diff</code>
593(as opposed to something like the <code>--stable</code> option to
594<a href="git-patch-id.html">git-patch-id(1)</a>). There&#8217;s also no equivalent of
595<a href="git-apply.html">git-apply(1)</a> for <code>range-diff</code>, the output is not intended to
596be machine-readable.</p>
597</div>
598<div class="paragraph">
599<p>This is particularly true when passing in diff options. Currently some
600options like <code>--stat</code> can, as an emergent effect, produce output
601that&#8217;s quite useless in the context of <code>range-diff</code>. Future versions
602of <code>range-diff</code> may learn to interpret such options in a manner
603specific to <code>range-diff</code> (e.g. for <code>--stat</code> producing human-readable
604output which summarizes how the diffstat changed).</p>
605</div>
606</div>
607</div>
608<div class="sect1">
609<h2 id="_configuration">CONFIGURATION</h2>
610<div class="sectionbody">
611<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]612<p>This command uses the <code>diff.color.</code>* and <code>pager.range-diff</code> settings
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]613(the latter is on by default).
614See <a href="git-config.html">git-config(1)</a>.</p>
615</div>
616</div>
617</div>
618<div class="sect1">
619<h2 id="_examples">EXAMPLES</h2>
620<div class="sectionbody">
621<div class="paragraph">
622<p>When a rebase required merge conflicts to be resolved, compare the changes
623introduced by the rebase directly afterwards using:</p>
624</div>
625<div class="listingblock">
626<div class="content">
627<pre>$ git range-diff @{u} @{1} @</pre>
628</div>
629</div>
630<div class="paragraph">
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]631<p>A typical output of <code>git</code> <code>range-diff</code> would look like this:</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]632</div>
633<div class="listingblock">
634<div class="content">
635<pre>-: ------- &gt; 1: 0ddba11 Prepare for the inevitable!
6361: c0debee = 2: cab005e Add a helpful message at the start
6372: f00dbal ! 3: decafe1 Describe a bug
638 @@ -1,3 +1,3 @@
639 Author: A U Thor &lt;author@example.com&gt;
640
641 -TODO: Describe a bug
642 +Describe a bug
643 @@ -324,5 +324,6
644 This is expected.
645
646 -+What is unexpected is that it will also crash.
647 ++Unexpectedly, it also crashes. This is a bug, and the jury is
648 ++still out there how to fix it best. See ticket #314 for details.
649
650 Contact
6513: bedead &lt; -: ------- TO-UNDO</pre>
652</div>
653</div>
654<div class="paragraph">
655<p>In this example, there are 3 old and 3 new commits, where the developer
656removed the 3rd, added a new one before the first two, and modified the
657commit message of the 2nd commit as well as its diff.</p>
658</div>
659<div class="paragraph">
660<p>When the output goes to a terminal, it is color-coded by default, just
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]661like regular <code>git</code> <code>diff</code>'s output. In addition, the first line (adding a
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]662commit) is green, the last line (deleting a commit) is red, the second
Junio C Hamanodc392382024-10-11 18:57:29[diff] [blame]663line (with a perfect match) is yellow like the commit header of <code>git</code>
664<code>show</code>'s output, and the third line colors the old commit red, the new
665one green and the rest like <code>git</code> <code>show</code>'s commit header.</p>
Junio C Hamanob96f40a2024-08-01 00:57:25[diff] [blame]666</div>
667<div class="paragraph">
668<p>A naive color-coded diff of diffs is actually a bit hard to read,
669though, as it colors the entire lines red or green. The line that added
670"What is unexpected" in the old commit, for example, is completely red,
671even if the intent of the old commit was to add something.</p>
672</div>
673<div class="paragraph">
674<p>To help with that, <code>range</code> uses the <code>--dual-color</code> mode by default. In
675this mode, the diff of diffs will retain the original diff colors, and
676prefix the lines with -/+ markers that have their <strong>background</strong> red or
677green, to make it more obvious that they describe how the diff itself
678changed.</p>
679</div>
680</div>
681</div>
682<div class="sect1">
683<h2 id="_algorithm">Algorithm</h2>
684<div class="sectionbody">
685<div class="paragraph">
686<p>The general idea is this: we generate a cost matrix between the commits
687in both commit ranges, then solve the least-cost assignment.</p>
688</div>
689<div class="paragraph">
690<p>The cost matrix is populated thusly: for each pair of commits, both
691diffs are generated and the "diff of diffs" is generated, with 3 context
692lines, then the number of lines in that diff is used as cost.</p>
693</div>
694<div class="paragraph">
695<p>To avoid false positives (e.g. when a patch has been removed, and an
696unrelated patch has been added between two iterations of the same patch
697series), the cost matrix is extended to allow for that, by adding
698fixed-cost entries for wholesale deletes/adds.</p>
699</div>
700<div class="paragraph">
701<p>Example: Let commits <code>1--2</code> be the first iteration of a patch series and
702<code>A--C</code> the second iteration. Let&#8217;s assume that <code>A</code> is a cherry-pick of
703<code>2,</code> and <code>C</code> is a cherry-pick of <code>1</code> but with a small modification (say,
704a fixed typo). Visualize the commits as a bipartite graph:</p>
705</div>
706<div class="listingblock">
707<div class="content">
708<pre> 1 A
709
710 2 B
711
712 C</pre>
713</div>
714</div>
715<div class="paragraph">
716<p>We are looking for a "best" explanation of the new series in terms of
717the old one. We can represent an "explanation" as an edge in the graph:</p>
718</div>
719<div class="listingblock">
720<div class="content">
721<pre> 1 A
722 /
723 2 --------' B
724
725 C</pre>
726</div>
727</div>
728<div class="paragraph">
729<p>This explanation comes for "free" because there was no change. Similarly
730<code>C</code> could be explained using <code>1</code>, but that comes at some cost c&gt;0
731because of the modification:</p>
732</div>
733<div class="listingblock">
734<div class="content">
735<pre> 1 ----. A
736 | /
737 2 ----+---' B
738 |
739 `----- C
740 c&gt;0</pre>
741</div>
742</div>
743<div class="paragraph">
744<p>In mathematical terms, what we are looking for is some sort of a minimum
745cost bipartite matching; <code>1</code> is matched to <code>C</code> at some cost, etc. The
746underlying graph is in fact a complete bipartite graph; the cost we
747associate with every edge is the size of the diff between the two
748commits' patches. To explain also new commits, we introduce dummy nodes
749on both sides:</p>
750</div>
751<div class="listingblock">
752<div class="content">
753<pre> 1 ----. A
754 | /
755 2 ----+---' B
756 |
757 o `----- C
758 c&gt;0
759 o o
760
761 o o</pre>
762</div>
763</div>
764<div class="paragraph">
765<p>The cost of an edge <code>o--C</code> is the size of <code>C</code>'s diff, modified by a
766fudge factor that should be smaller than 100%. The cost of an edge
767<code>o--o</code> is free. The fudge factor is necessary because even if <code>1</code> and
768<code>C</code> have nothing in common, they may still share a few empty lines and
769such, possibly making the assignment <code>1--C</code>, <code>o--o</code> slightly cheaper
770than <code>1--o</code>, <code>o--C</code> even if <code>1</code> and <code>C</code> have nothing in common. With the
771fudge factor we require a much larger common part to consider patches as
772corresponding.</p>
773</div>
774<div class="paragraph">
775<p>The overall time needed to compute this algorithm is the time needed to
776compute n+m commit diffs and then n*m diffs of patches, plus the time
777needed to compute the least-cost assignment between n and m diffs. Git
778uses an implementation of the Jonker-Volgenant algorithm to solve the
779assignment problem, which has cubic runtime complexity. The matching
780found in this case will look like this:</p>
781</div>
782<div class="listingblock">
783<div class="content">
784<pre> 1 ----. A
785 | /
786 2 ----+---' B
787 .--+-----'
788 o -' `----- C
789 c&gt;0
790 o ---------- o
791
792 o ---------- o</pre>
793</div>
794</div>
795</div>
796</div>
797<div class="sect1">
798<h2 id="_see_also">SEE ALSO</h2>
799<div class="sectionbody">
800<div class="paragraph">
801<p><a href="git-log.html">git-log(1)</a></p>
802</div>
803</div>
804</div>
805<div class="sect1">
806<h2 id="_git">GIT</h2>
807<div class="sectionbody">
808<div class="paragraph">
809<p>Part of the <a href="git.html">git(1)</a> suite</p>
810</div>
811</div>
812</div>
813</div>
814<div id="footer">
815<div id="footer-text">
816Last updated 2023-10-29 16:42:00 -0700
817</div>
818</div>
819</body>
820</html>