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