git-diff-index.html

   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-diff-index(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"; */
  14 html{font-family:sans-serif;-webkit-text-size-adjust:100%}
  15 a{background:none}
  16 a:focus{outline:thin dotted}
  17 a:active,a:hover{outline:0}
  18 h1{font-size:2em;margin:.67em 0}
  19 b,strong{font-weight:bold}
  20 abbr{font-size:.9em}
  21 abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none}
  22 dfn{font-style:italic}
  23 hr{height:0}
  24 mark{background:#ff0;color:#000}
  25 code,kbd,pre,samp{font-family:monospace;font-size:1em}
  26 pre{white-space:pre-wrap}
  27 q{quotes:"\201C" "\201D" "\2018" "\2019"}
  28 small{font-size:80%}
  29 sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
  30 sup{top:-.5em}
  31 sub{bottom:-.25em}
  32 img{border:0}
  33 svg:not(:root){overflow:hidden}
  34 figure{margin:0}
  35 audio,video{display:inline-block}
  36 audio:not([controls]){display:none;height:0}
  37 fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
  38 legend{border:0;padding:0}
  39 button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
  40 button,input{line-height:normal}
  41 button,select{text-transform:none}
  42 button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
  43 button[disabled],html input[disabled]{cursor:default}
  44 input[type=checkbox],input[type=radio]{padding:0}
  45 button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
  46 textarea{overflow:auto;vertical-align:top}
  47 table{border-collapse:collapse;border-spacing:0}
  48 *,::before,::after{box-sizing:border-box}
  49 html,body{font-size:100%}
  50 body{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}
  51 a:hover{cursor:pointer}
  52 img,object,embed{max-width:100%;height:auto}
  53 object,embed{height:100%}
  54 img{-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}
  62 img,object,svg{display:inline-block;vertical-align:middle}
  63 textarea{height:auto;min-height:50px}
  64 select{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}
  66 div,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}
  67 a{color:#2156a5;text-decoration:underline;line-height:inherit}
  68 a:hover,a:focus{color:#1d4b8f}
  69 a img{border:0}
  70 p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
  71 p aside{font-size:.875em;line-height:1.35;font-style:italic}
  72 h1,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}
  73 h1 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}
  74 h1{font-size:2.125em}
  75 h2{font-size:1.6875em}
  76 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
  77 h4,h5{font-size:1.125em}
  78 h6{font-size:1em}
  79 hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em}
  80 em,i{font-style:italic;line-height:inherit}
  81 strong,b{font-weight:bold;line-height:inherit}
  82 small{font-size:60%;line-height:inherit}
  83 code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
  84 ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
  85 ul,ol{margin-left:1.5em}
  86 ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
  87 ul.circle{list-style-type:circle}
  88 ul.disc{list-style-type:disc}
  89 ul.square{list-style-type:square}
  90 ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
  91 ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
  92 dl dt{margin-bottom:.3125em;font-weight:bold}
  93 dl dd{margin-bottom:1.25em}
  94 blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
  95 blockquote,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}
  97 h1{font-size:2.75em}
  98 h2{font-size:2.3125em}
  99 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 100 h4{font-size:1.4375em}}
 101 table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal}
 102 table thead,table tfoot{background:#f7f8f7}
 103 table 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}
 104 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 105 table tr.even,table tr.alt{background:#f8f8f7}
 106 table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 107 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 108 h1 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}
 117 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 118 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 119 pre>code{display:block}
 120 pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
 121 em em{font-style:normal}
 122 strong strong{font-weight:400}
 123 .keyseq{color:rgba(51,51,51,.8)}
 124 kbd{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}
 132 b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
 133 b.button::before{content:"[";padding:0 3px 0 2px}
 134 b.button::after{content:"]";padding:0 2px 0 3px}
 135 p 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}
 164 body.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}
 170 body.toc2.toc-right{padding-left:0;padding-right:15em}
 171 body.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}
 177 body.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}
 194 details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
 195 details{margin-left:1.25rem}
 196 details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent}
 197 details>summary::-webkit-details-marker{display:none}
 198 details>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%)}
 199 details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)}
 200 details>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}
 202 table.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}
 229 pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
 230 pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
 231 pre.prettyprint li code[data-lang]::before{opacity:1}
 232 pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
 233 table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
 234 table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
 235 table.linenotable td.code{padding-left:.75em}
 236 table.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}
 237 pre.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}
 260 p.tableblock:last-child{margin-bottom:0}
 261 td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 262 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
 263 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
 264 table.grid-all>*>tr>*{border-width:1px}
 265 table.grid-cols>*>tr>*{border-width:0 1px}
 266 table.grid-rows>*>tr>*{border-width:1px 0}
 267 table.frame-all{border-width:1px}
 268 table.frame-ends{border-width:1px 0}
 269 table.frame-sides{border-width:0 1px}
 270 table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
 271 table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
 272 table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
 273 table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 274 table.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}
 275 th.halign-left,td.halign-left{text-align:left}
 276 th.halign-right,td.halign-right{text-align:right}
 277 th.halign-center,td.halign-center{text-align:center}
 278 th.valign-top,td.valign-top{vertical-align:top}
 279 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 280 th.valign-middle,td.valign-middle{vertical-align:middle}
 281 table thead th,table tfoot th{font-weight:bold}
 282 tbody tr th{background:#f7f8f7}
 283 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 284 p.tableblock>code:only-child{background:none;padding:0}
 285 p.tableblock{font-size:1em}
 286 ol{margin-left:1.75em}
 287 ul li ol{margin-left:1.5em}
 288 dl dd{margin-left:1.125em}
 289 dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
 290 li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
 291 ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
 292 ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
 293 ul.unstyled,ol.unstyled{margin-left:0}
 294 li>p:empty:only-child::before{content:"";display:inline-block}
 295 ul.checklist>li>p:first-child{margin-left:-1em}
 296 ul.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}
 297 ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em}
 298 ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
 299 ul.inline>li{margin-left:1.25em}
 300 .unstyled dl dt{font-weight:400;font-style:normal}
 301 ol.arabic{list-style-type:decimal}
 302 ol.decimal{list-style-type:decimal-leading-zero}
 303 ol.loweralpha{list-style-type:lower-alpha}
 304 ol.upperalpha{list-style-type:upper-alpha}
 305 ol.lowerroman{list-style-type:lower-roman}
 306 ol.upperroman{list-style-type:upper-roman}
 307 ol.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}
 310 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 311 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
 312 td.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}
 326 a.image{text-decoration:none;display:inline-block}
 327 a.image object{pointer-events:none}
 328 sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
 329 sup.footnote a,sup.footnoteref a{text-decoration:none}
 330 sup.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}
 337 div.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}
 375 span.icon>.fa{cursor:default}
 376 a 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)}
 387 pre .conum[data-value]{position:relative;top:-.125em}
 388 b.conum *{color:inherit!important}
 389 .conum:not([data-value]):empty{display:none}
 390 dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
 391 h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em}
 392 p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
 393 p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem}
 394 p{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}
 400 html{font-size:80%}
 401 a{color:inherit!important;text-decoration:underline!important}
 402 a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
 403 a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
 404 abbr[title]{border-bottom:1px dotted}
 405 abbr[title]::after{content:" (" attr(title) ")"}
 406 pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
 407 thead{display:table-header-group}
 408 svg{max-width:100%}
 409 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 410 h2,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}
 414 body.book #header{text-align:center}
 415 body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
 416 body.book #header .details{border:0!important;display:block;padding:0!important}
 417 body.book #header .details span:first-child{margin-left:0!important}
 418 body.book #header .details br{display:block}
 419 body.book #header .details br+span::before{content:none!important}
 420 body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
 421 body.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>
 436 pre>code {
 437    display: inline;
 438 }
 439 </style>
 440 </head>
 441 <body class="manpage">
 442 <div id="header">
 443 <h1>git-diff-index(1) Manual Page</h1>
 444 <h2 id="_name">NAME</h2>
 445 <div class="sectionbody">
 446 <p>git-diff-index - Compare a tree to the working tree or index</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 diff-index</em> [-m] [--cached] [--merge-base] [&lt;common-diff-options&gt;] &lt;tree-ish&gt; [&lt;path&gt;&#8230;&#8203;]</pre>
 455 </div>
 456 </div>
 457 </div>
 458 <div class="sect1">
 459 <h2 id="_description">DESCRIPTION</h2>
 460 <div class="sectionbody">
 461 <div class="paragraph">
 462 <p>Compare the content and mode of the blobs found in a tree object
 463 with the corresponding tracked files in the working tree, or with the
 464 corresponding paths in the index.  When &lt;path&gt; arguments are present,
 465 compare only paths matching those patterns.  Otherwise all tracked
 466 files are compared.</p>
 467 </div>
 468 </div>
 469 </div>
 470 <div class="sect1">
 471 <h2 id="_options">OPTIONS</h2>
 472 <div class="sectionbody">
 473 <div class="dlist">
 474 <dl>
 475 <dt class="hdlist1">-p</dt>
 476 <dt class="hdlist1">-u</dt>
 477 <dt class="hdlist1">--patch</dt>
 478 <dd>
 479 <p>Generate patch (see <a href="#generate_patch_text_with_p">Generating patch text with -p</a>).</p>
 480 </dd>
 481 <dt class="hdlist1">-s</dt>
 482 <dt class="hdlist1">--no-patch</dt>
 483 <dd>
 484 <p>Suppress all output from the diff machinery.  Useful for
 485 commands like <code>git</code> <code>show</code> that show the patch by default to
 486 squelch their output, or to cancel the effect of options like
 487 <code>--patch</code>, <code>--stat</code> earlier on the command line in an alias.</p>
 488 </dd>
 489 <dt class="hdlist1">-U&lt;n&gt;</dt>
 490 <dt class="hdlist1">--unified=&lt;n&gt;</dt>
 491 <dd>
 492 <p>Generate diffs with &lt;n&gt; lines of context instead of
 493 the usual three.
 494 Implies <code>--patch</code>.</p>
 495 </dd>
 496 <dt class="hdlist1">--output=&lt;file&gt;</dt>
 497 <dd>
 498 <p>Output to a specific file instead of stdout.</p>
 499 </dd>
 500 <dt class="hdlist1">--output-indicator-new=&lt;char&gt;</dt>
 501 <dt class="hdlist1">--output-indicator-old=&lt;char&gt;</dt>
 502 <dt class="hdlist1">--output-indicator-context=&lt;char&gt;</dt>
 503 <dd>
 504 <p>Specify the character used to indicate new, old or context
 505 lines in the generated patch. Normally they are <em>+</em>, <em>-</em> and
 506 ' ' respectively.</p>
 507 </dd>
 508 <dt class="hdlist1">--raw</dt>
 509 <dd>
 510 <p>Generate the diff in raw format.
 511 This is the default.</p>
 512 </dd>
 513 <dt class="hdlist1">--patch-with-raw</dt>
 514 <dd>
 515 <p>Synonym for <code>-p</code> <code>--raw</code>.</p>
 516 </dd>
 517 <dt class="hdlist1">--indent-heuristic</dt>
 518 <dd>
 519 <p>Enable the heuristic that shifts diff hunk boundaries to make patches
 520 easier to read. This is the default.</p>
 521 </dd>
 522 <dt class="hdlist1">--no-indent-heuristic</dt>
 523 <dd>
 524 <p>Disable the indent heuristic.</p>
 525 </dd>
 526 <dt class="hdlist1">--minimal</dt>
 527 <dd>
 528 <p>Spend extra time to make sure the smallest possible
 529 diff is produced.</p>
 530 </dd>
 531 <dt class="hdlist1">--patience</dt>
 532 <dd>
 533 <p>Generate a diff using the "patience diff" algorithm.</p>
 534 </dd>
 535 <dt class="hdlist1">--histogram</dt>
 536 <dd>
 537 <p>Generate a diff using the "histogram diff" algorithm.</p>
 538 </dd>
 539 <dt class="hdlist1">--anchored=&lt;text&gt;</dt>
 540 <dd>
 541 <p>Generate a diff using the "anchored diff" algorithm.</p>
 542 <div class="paragraph">
 543 <p>This option may be specified more than once.</p>
 544 </div>
 545 <div class="paragraph">
 546 <p>If a line exists in both the source and destination, exists only once,
 547 and starts with this text, this algorithm attempts to prevent it from
 548 appearing as a deletion or addition in the output. It uses the "patience
 549 diff" algorithm internally.</p>
 550 </div>
 551 </dd>
 552 <dt class="hdlist1">--diff-algorithm={patience|minimal|histogram|myers}</dt>
 553 <dd>
 554 <p>Choose a diff algorithm. The variants are as follows:</p>
 555 <div class="openblock">
 556 <div class="content">
 557 <div class="dlist">
 558 <dl>
 559 <dt class="hdlist1"><code>default</code>, <code>myers</code></dt>
 560 <dd>
 561 <p>The basic greedy diff algorithm. Currently, this is the default.</p>
 562 </dd>
 563 <dt class="hdlist1"><code>minimal</code></dt>
 564 <dd>
 565 <p>Spend extra time to make sure the smallest possible diff is
 566 produced.</p>
 567 </dd>
 568 <dt class="hdlist1"><code>patience</code></dt>
 569 <dd>
 570 <p>Use "patience diff" algorithm when generating patches.</p>
 571 </dd>
 572 <dt class="hdlist1"><code>histogram</code></dt>
 573 <dd>
 574 <p>This algorithm extends the patience algorithm to "support
 575 low-occurrence common elements".</p>
 576 </dd>
 577 </dl>
 578 </div>
 579 </div>
 580 </div>
 581 <div class="paragraph">
 582 <p>For instance, if you configured the <code>diff.algorithm</code> variable to a
 583 non-default value and want to use the default one, then you
 584 have to use <code>--diff-algorithm=default</code> option.</p>
 585 </div>
 586 </dd>
 587 <dt class="hdlist1">--stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]</dt>
 588 <dd>
 589 <p>Generate a diffstat. By default, as much space as necessary
 590 will be used for the filename part, and the rest for the graph
 591 part. Maximum width defaults to terminal width, or 80 columns
 592 if not connected to a terminal, and can be overridden by
 593 <em>&lt;width&gt;</em>. The width of the filename part can be limited by
 594 giving another width <em>&lt;name-width&gt;</em> after a comma or by setting
 595 <code>diff.statNameWidth=</code><em>&lt;width&gt;</em>. The width of the graph part can be
 596 limited by using <code>--stat-graph-width=</code><em>&lt;width&gt;</em> or by setting
 597 <code>diff.statGraphWidth=</code><em>&lt;width&gt;</em>. Using <code>--stat</code> or
 598 <code>--stat-graph-width</code> affects all commands generating a stat graph,
 599 while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
 600 does not affect <code>git</code> <code>format-patch</code>.
 601 By giving a third parameter <em>&lt;count&gt;</em>, you can limit the output to
 602 the first <em>&lt;count&gt;</em> lines, followed by ... if there are more.</p>
 603 <div class="paragraph">
 604 <p>These parameters can also be set individually with <code>--stat-width=</code><em>&lt;width&gt;</em>,
 605 <code>--stat-name-width=</code><em>&lt;name-width&gt;</em> and <code>--stat-count=</code><em>&lt;count&gt;</em>.</p>
 606 </div>
 607 </dd>
 608 <dt class="hdlist1">--compact-summary</dt>
 609 <dd>
 610 <p>Output a condensed summary of extended header information such
 611 as file creations or deletions ("new" or "gone", optionally "+l"
 612 if it&#8217;s a symlink) and mode changes ("+x" or "-x" for adding
 613 or removing executable bit respectively) in diffstat. The
 614 information is put between the filename part and the graph
 615 part. Implies <code>--stat</code>.</p>
 616 </dd>
 617 <dt class="hdlist1">--numstat</dt>
 618 <dd>
 619 <p>Similar to <code>--stat</code>, but shows number of added and
 620 deleted lines in decimal notation and pathname without
 621 abbreviation, to make it more machine friendly.  For
 622 binary files, outputs two <code>-</code> instead of saying
 623 <code>0</code> <code>0</code>.</p>
 624 </dd>
 625 <dt class="hdlist1">--shortstat</dt>
 626 <dd>
 627 <p>Output only the last line of the <code>--stat</code> format containing total
 628 number of modified files, as well as number of added and deleted
 629 lines.</p>
 630 </dd>
 631 <dt class="hdlist1">-X[&lt;param1,param2,&#8230;&#8203;&gt;]</dt>
 632 <dt class="hdlist1">--dirstat[=&lt;param1,param2,&#8230;&#8203;&gt;]</dt>
 633 <dd>
 634 <p>Output the distribution of relative amount of changes for each
 635 sub-directory. The behavior of <code>--dirstat</code> can be customized by
 636 passing it a comma separated list of parameters.
 637 The defaults are controlled by the <code>diff.dirstat</code> configuration
 638 variable (see <a href="git-config.html">git-config(1)</a>).
 639 The following parameters are available:</p>
 640 <div class="openblock">
 641 <div class="content">
 642 <div class="dlist">
 643 <dl>
 644 <dt class="hdlist1"><code>changes</code></dt>
 645 <dd>
 646 <p>Compute the dirstat numbers by counting the lines that have been
 647 removed from the source, or added to the destination. This ignores
 648 the amount of pure code movements within a file.  In other words,
 649 rearranging lines in a file is not counted as much as other changes.
 650 This is the default behavior when no parameter is given.</p>
 651 </dd>
 652 <dt class="hdlist1"><code>lines</code></dt>
 653 <dd>
 654 <p>Compute the dirstat numbers by doing the regular line-based diff
 655 analysis, and summing the removed/added line counts. (For binary
 656 files, count 64-byte chunks instead, since binary files have no
 657 natural concept of lines). This is a more expensive <code>--dirstat</code>
 658 behavior than the <code>changes</code> behavior, but it does count rearranged
 659 lines within a file as much as other changes. The resulting output
 660 is consistent with what you get from the other <code>--</code>*stat options.</p>
 661 </dd>
 662 <dt class="hdlist1"><code>files</code></dt>
 663 <dd>
 664 <p>Compute the dirstat numbers by counting the number of files changed.
 665 Each changed file counts equally in the dirstat analysis. This is
 666 the computationally cheapest <code>--dirstat</code> behavior, since it does
 667 not have to look at the file contents at all.</p>
 668 </dd>
 669 <dt class="hdlist1"><code>cumulative</code></dt>
 670 <dd>
 671 <p>Count changes in a child directory for the parent directory as well.
 672 Note that when using <code>cumulative</code>, the sum of the percentages
 673 reported may exceed 100%. The default (non-cumulative) behavior can
 674 be specified with the <code>noncumulative</code> parameter.</p>
 675 </dd>
 676 <dt class="hdlist1">&lt;limit&gt;</dt>
 677 <dd>
 678 <p>An integer parameter specifies a cut-off percent (3% by default).
 679 Directories contributing less than this percentage of the changes
 680 are not shown in the output.</p>
 681 </dd>
 682 </dl>
 683 </div>
 684 </div>
 685 </div>
 686 <div class="paragraph">
 687 <p>Example: The following will count changed files, while ignoring
 688 directories with less than 10% of the total amount of changed files,
 689 and accumulating child directory counts in the parent directories:
 690 <code>--dirstat=files,10,cumulative</code>.</p>
 691 </div>
 692 </dd>
 693 <dt class="hdlist1">--cumulative</dt>
 694 <dd>
 695 <p>Synonym for --dirstat=cumulative</p>
 696 </dd>
 697 <dt class="hdlist1">--dirstat-by-file[=&lt;param1,param2&gt;&#8230;&#8203;]</dt>
 698 <dd>
 699 <p>Synonym for --dirstat=files,&lt;param1&gt;,&lt;param2&gt;&#8230;&#8203;</p>
 700 </dd>
 701 <dt class="hdlist1">--summary</dt>
 702 <dd>
 703 <p>Output a condensed summary of extended header information
 704 such as creations, renames and mode changes.</p>
 705 </dd>
 706 <dt class="hdlist1">--patch-with-stat</dt>
 707 <dd>
 708 <p>Synonym for <code>-p</code> <code>--stat</code>.</p>
 709 </dd>
 710 <dt class="hdlist1">-z</dt>
 711 <dd>
 712 <p>When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
 713 given, do not munge pathnames and use NULs as output field terminators.</p>
 714 <div class="paragraph">
 715 <p>Without this option, pathnames with "unusual" characters are quoted as
 716 explained for the configuration variable <code>core.quotePath</code> (see
 717 <a href="git-config.html">git-config(1)</a>).</p>
 718 </div>
 719 </dd>
 720 <dt class="hdlist1">--name-only</dt>
 721 <dd>
 722 <p>Show only the name of each changed file in the post-image tree.
 723 The file names are often encoded in UTF-8.
 724 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
 725 manual page.</p>
 726 </dd>
 727 <dt class="hdlist1">--name-status</dt>
 728 <dd>
 729 <p>Show only the name(s) and status of each changed file. See the description
 730 of the <code>--diff-filter</code> option on what the status letters mean.
 731 Just like <code>--name-only</code> the file names are often encoded in UTF-8.</p>
 732 </dd>
 733 <dt class="hdlist1">--submodule[=&lt;format&gt;]</dt>
 734 <dd>
 735 <p>Specify how differences in submodules are shown.  When specifying
 736 <code>--submodule=short</code> the <em>short</em> format is used.  This format just
 737 shows the names of the commits at the beginning and end of the range.
 738 When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em>
 739 format is used.  This format lists the commits in the range like
 740 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does.  When <code>--submodule=diff</code>
 741 is specified, the <em>diff</em> format is used.  This format shows an
 742 inline diff of the changes in the submodule contents between the
 743 commit range.  Defaults to <code>diff.submodule</code> or the <em>short</em> format
 744 if the config option is unset.</p>
 745 </dd>
 746 <dt class="hdlist1">--color[=&lt;when&gt;]</dt>
 747 <dd>
 748 <p>Show colored diff.
 749 <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
 750 <em>&lt;when&gt;</em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.</p>
 751 </dd>
 752 <dt class="hdlist1">--no-color</dt>
 753 <dd>
 754 <p>Turn off colored diff.
 755 It is the same as <code>--color=never</code>.</p>
 756 </dd>
 757 <dt class="hdlist1">--color-moved[=&lt;mode&gt;]</dt>
 758 <dd>
 759 <p>Moved lines of code are colored differently.
 760 The &lt;mode&gt; defaults to <em>no</em> if the option is not given
 761 and to <em>zebra</em> if the option with no mode is given.
 762 The mode must be one of:</p>
 763 <div class="openblock">
 764 <div class="content">
 765 <div class="dlist">
 766 <dl>
 767 <dt class="hdlist1">no</dt>
 768 <dd>
 769 <p>Moved lines are not highlighted.</p>
 770 </dd>
 771 <dt class="hdlist1">default</dt>
 772 <dd>
 773 <p>Is a synonym for <code>zebra</code>. This may change to a more sensible mode
 774 in the future.</p>
 775 </dd>
 776 <dt class="hdlist1">plain</dt>
 777 <dd>
 778 <p>Any line that is added in one location and was removed
 779 in another location will be colored with <em>color.diff.newMoved</em>.
 780 Similarly <em>color.diff.oldMoved</em> will be used for removed lines
 781 that are added somewhere else in the diff. This mode picks up any
 782 moved line, but it is not very useful in a review to determine
 783 if a block of code was moved without permutation.</p>
 784 </dd>
 785 <dt class="hdlist1">blocks</dt>
 786 <dd>
 787 <p>Blocks of moved text of at least 20 alphanumeric characters
 788 are detected greedily. The detected blocks are
 789 painted using either the <em>color.diff.{old,new}Moved</em> color.
 790 Adjacent blocks cannot be told apart.</p>
 791 </dd>
 792 <dt class="hdlist1">zebra</dt>
 793 <dd>
 794 <p>Blocks of moved text are detected as in <em>blocks</em> mode. The blocks
 795 are painted using either the <em>color.diff.{old,new}Moved</em> color or
 796 <em>color.diff.{old,new}MovedAlternative</em>. The change between
 797 the two colors indicates that a new block was detected.</p>
 798 </dd>
 799 <dt class="hdlist1">dimmed-zebra</dt>
 800 <dd>
 801 <p>Similar to <em>zebra</em>, but additional dimming of uninteresting parts
 802 of moved code is performed. The bordering lines of two adjacent
 803 blocks are considered interesting, the rest is uninteresting.
 804 <code>dimmed_zebra</code> is a deprecated synonym.</p>
 805 </dd>
 806 </dl>
 807 </div>
 808 </div>
 809 </div>
 810 </dd>
 811 <dt class="hdlist1">--no-color-moved</dt>
 812 <dd>
 813 <p>Turn off move detection. This can be used to override configuration
 814 settings. It is the same as <code>--color-moved=no</code>.</p>
 815 </dd>
 816 <dt class="hdlist1">--color-moved-ws=&lt;modes&gt;</dt>
 817 <dd>
 818 <p>This configures how whitespace is ignored when performing the
 819 move detection for <code>--color-moved</code>.
 820 These modes can be given as a comma separated list:</p>
 821 <div class="openblock">
 822 <div class="content">
 823 <div class="dlist">
 824 <dl>
 825 <dt class="hdlist1">no</dt>
 826 <dd>
 827 <p>Do not ignore whitespace when performing move detection.</p>
 828 </dd>
 829 <dt class="hdlist1">ignore-space-at-eol</dt>
 830 <dd>
 831 <p>Ignore changes in whitespace at EOL.</p>
 832 </dd>
 833 <dt class="hdlist1">ignore-space-change</dt>
 834 <dd>
 835 <p>Ignore changes in amount of whitespace.  This ignores whitespace
 836 at line end, and considers all other sequences of one or
 837 more whitespace characters to be equivalent.</p>
 838 </dd>
 839 <dt class="hdlist1">ignore-all-space</dt>
 840 <dd>
 841 <p>Ignore whitespace when comparing lines. This ignores differences
 842 even if one line has whitespace where the other line has none.</p>
 843 </dd>
 844 <dt class="hdlist1">allow-indentation-change</dt>
 845 <dd>
 846 <p>Initially ignore any whitespace in the move detection, then
 847 group the moved code blocks only into a block if the change in
 848 whitespace is the same per line. This is incompatible with the
 849 other modes.</p>
 850 </dd>
 851 </dl>
 852 </div>
 853 </div>
 854 </div>
 855 </dd>
 856 <dt class="hdlist1">--no-color-moved-ws</dt>
 857 <dd>
 858 <p>Do not ignore whitespace when performing move detection. This can be
 859 used to override configuration settings. It is the same as
 860 <code>--color-moved-ws=no</code>.</p>
 861 </dd>
 862 <dt class="hdlist1">--word-diff[=&lt;mode&gt;]</dt>
 863 <dd>
 864 <p>Show a word diff, using the &lt;mode&gt; to delimit changed words.
 865 By default, words are delimited by whitespace; see
 866 <code>--word-diff-regex</code> below.  The &lt;mode&gt; defaults to <em>plain</em>, and
 867 must be one of:</p>
 868 <div class="openblock">
 869 <div class="content">
 870 <div class="dlist">
 871 <dl>
 872 <dt class="hdlist1">color</dt>
 873 <dd>
 874 <p>Highlight changed words using only colors.  Implies <code>--color</code>.</p>
 875 </dd>
 876 <dt class="hdlist1">plain</dt>
 877 <dd>
 878 <p>Show words as [<code>-removed-</code>] and {+added+}.  Makes no
 879 attempts to escape the delimiters if they appear in the input,
 880 so the output may be ambiguous.</p>
 881 </dd>
 882 <dt class="hdlist1">porcelain</dt>
 883 <dd>
 884 <p>Use a special line-based format intended for script
 885 consumption.  Added/removed/unchanged runs are printed in the
 886 usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
 887 character at the beginning of the line and extending to the
 888 end of the line.  Newlines in the input are represented by a
 889 tilde <code>~</code> on a line of its own.</p>
 890 </dd>
 891 <dt class="hdlist1">none</dt>
 892 <dd>
 893 <p>Disable word diff again.</p>
 894 </dd>
 895 </dl>
 896 </div>
 897 </div>
 898 </div>
 899 <div class="paragraph">
 900 <p>Note that despite the name of the first mode, color is used to
 901 highlight the changed parts in all modes if enabled.</p>
 902 </div>
 903 </dd>
 904 <dt class="hdlist1">--word-diff-regex=&lt;regex&gt;</dt>
 905 <dd>
 906 <p>Use &lt;regex&gt; to decide what a word is, instead of considering
 907 runs of non-whitespace to be a word.  Also implies
 908 <code>--word-diff</code> unless it was already enabled.</p>
 909 <div class="paragraph">
 910 <p>Every non-overlapping match of the
 911 &lt;regex&gt; is considered a word.  Anything between these matches is
 912 considered whitespace and ignored(!) for the purposes of finding
 913 differences.  You may want to append |[<code>^</code>[<code>:space:</code>]] to your regular
 914 expression to make sure that it matches all non-whitespace characters.
 915 A match that contains a newline is silently truncated(!) at the
 916 newline.</p>
 917 </div>
 918 <div class="paragraph">
 919 <p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
 920 and, correspondingly, show differences character by character.</p>
 921 </div>
 922 <div class="paragraph">
 923 <p>The regex can also be set via a diff driver or configuration option, see
 924 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>.  Giving it explicitly
 925 overrides any diff driver or configuration setting.  Diff drivers
 926 override configuration settings.</p>
 927 </div>
 928 </dd>
 929 <dt class="hdlist1">--color-words[=&lt;regex&gt;]</dt>
 930 <dd>
 931 <p>Equivalent to <code>--word-diff=color</code> plus (if a regex was
 932 specified) <code>--word-diff-regex=</code><em>&lt;regex&gt;</em>.</p>
 933 </dd>
 934 <dt class="hdlist1">--no-renames</dt>
 935 <dd>
 936 <p>Turn off rename detection, even when the configuration
 937 file gives the default to do so.</p>
 938 </dd>
 939 <dt class="hdlist1">--[no-]rename-empty</dt>
 940 <dd>
 941 <p>Whether to use empty blobs as rename source.</p>
 942 </dd>
 943 <dt class="hdlist1">--check</dt>
 944 <dd>
 945 <p>Warn if changes introduce conflict markers or whitespace errors.
 946 What are considered whitespace errors is controlled by <code>core.whitespace</code>
 947 configuration.  By default, trailing whitespaces (including
 948 lines that consist solely of whitespaces) and a space character
 949 that is immediately followed by a tab character inside the
 950 initial indent of the line are considered whitespace errors.
 951 Exits with non-zero status if problems are found. Not compatible
 952 with --exit-code.</p>
 953 </dd>
 954 <dt class="hdlist1">--ws-error-highlight=&lt;kind&gt;</dt>
 955 <dd>
 956 <p>Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
 957 lines of the diff.  Multiple values are separated by comma,
 958 <code>none</code> resets previous values, <code>default</code> reset the list to
 959 <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>.  When
 960 this option is not given, and the configuration variable
 961 <code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
 962 <code>new</code> lines are highlighted. The whitespace errors are colored
 963 with <code>color.diff.whitespace</code>.</p>
 964 </dd>
 965 <dt class="hdlist1">--full-index</dt>
 966 <dd>
 967 <p>Instead of the first handful of characters, show the full
 968 pre- and post-image blob object names on the "index"
 969 line when generating patch format output.</p>
 970 </dd>
 971 <dt class="hdlist1">--binary</dt>
 972 <dd>
 973 <p>In addition to <code>--full-index</code>, output a binary diff that
 974 can be applied with <code>git-apply</code>.
 975 Implies <code>--patch</code>.</p>
 976 </dd>
 977 <dt class="hdlist1">--abbrev[=&lt;n&gt;]</dt>
 978 <dd>
 979 <p>Instead of showing the full 40-byte hexadecimal object
 980 name in diff-raw format output and diff-tree header
 981 lines, show the shortest prefix that is at least <em>&lt;n&gt;</em>
 982 hexdigits long that uniquely refers the object.
 983 In diff-patch output format, <code>--full-index</code> takes higher
 984 precedence, i.e. if <code>--full-index</code> is specified, full blob
 985 names will be shown regardless of <code>--abbrev</code>.
 986 Non default number of digits can be specified with <code>--abbrev=</code><em>&lt;n&gt;</em>.</p>
 987 </dd>
 988 <dt class="hdlist1">-B[&lt;n&gt;][/&lt;m&gt;]</dt>
 989 <dt class="hdlist1">--break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]</dt>
 990 <dd>
 991 <p>Break complete rewrite changes into pairs of delete and
 992 create. This serves two purposes:</p>
 993 <div class="paragraph">
 994 <p>It affects the way a change that amounts to a total rewrite of a file
 995 not as a series of deletion and insertion mixed together with a very
 996 few lines that happen to match textually as the context, but as a
 997 single deletion of everything old followed by a single insertion of
 998 everything new, and the number <code>m</code> controls this aspect of the -B
 999 option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
1000 original should remain in the result for Git to consider it a total
1001 rewrite (i.e. otherwise the resulting patch will be a series of
1002 deletion and insertion mixed together with context lines).</p>
1003 </div>
1004 <div class="paragraph">
1005 <p>When used with -M, a totally-rewritten file is also considered as the
1006 source of a rename (usually -M only considers a file that disappeared
1007 as the source of a rename), and the number <code>n</code> controls this aspect of
1008 the -B option (defaults to 50%). <code>-B20</code>% specifies that a change with
1009 addition and deletion compared to 20% or more of the file&#8217;s size are
1010 eligible for being picked up as a possible source of a rename to
1011 another file.</p>
1012 </div>
1013 </dd>
1014 <dt class="hdlist1">-M[&lt;n&gt;]</dt>
1015 <dt class="hdlist1">--find-renames[=&lt;n&gt;]</dt>
1016 <dd>
1017 <p>Detect renames.
1018 If <code>n</code> is specified, it is a threshold on the similarity
1019 index (i.e. amount of addition/deletions compared to the
1020 file&#8217;s size). For example, <code>-M90</code>% means Git should consider a
1021 delete/add pair to be a rename if more than 90% of the file
1022 hasn&#8217;t changed.  Without a % sign, the number is to be read as
1023 a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
1024 0.5, and is thus the same as <code>-M50</code>%.  Similarly, <code>-M05</code> is
1025 the same as <code>-M5</code>%.  To limit detection to exact renames, use
1026 <code>-M100</code>%.  The default similarity index is 50%.</p>
1027 </dd>
1028 <dt class="hdlist1">-C[&lt;n&gt;]</dt>
1029 <dt class="hdlist1">--find-copies[=&lt;n&gt;]</dt>
1030 <dd>
1031 <p>Detect copies as well as renames.  See also <code>--find-copies-harder</code>.
1032 If <code>n</code> is specified, it has the same meaning as for <code>-M</code><em>&lt;n&gt;</em>.</p>
1033 </dd>
1034 <dt class="hdlist1">--find-copies-harder</dt>
1035 <dd>
1036 <p>For performance reasons, by default, <code>-C</code> option finds copies only
1037 if the original file of the copy was modified in the same
1038 changeset.  This flag makes the command
1039 inspect unmodified files as candidates for the source of
1040 copy.  This is a very expensive operation for large
1041 projects, so use it with caution.  Giving more than one
1042 <code>-C</code> option has the same effect.</p>
1043 </dd>
1044 <dt class="hdlist1">-D</dt>
1045 <dt class="hdlist1">--irreversible-delete</dt>
1046 <dd>
1047 <p>Omit the preimage for deletes, i.e. print only the header but not
1048 the diff between the preimage and <code>/dev/null</code>. The resulting patch
1049 is not meant to be applied with <code>patch</code> or <code>git</code> <code>apply</code>; this is
1050 solely for people who want to just concentrate on reviewing the
1051 text after the change. In addition, the output obviously lacks
1052 enough information to apply such a patch in reverse, even manually,
1053 hence the name of the option.</p>
1054 <div class="paragraph">
1055 <p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1056 of a delete/create pair.</p>
1057 </div>
1058 </dd>
1059 <dt class="hdlist1">-l&lt;num&gt;</dt>
1060 <dd>
1061 <p>The <code>-M</code> and <code>-C</code> options involve some preliminary steps that
1062 can detect subsets of renames/copies cheaply, followed by an
1063 exhaustive fallback portion that compares all remaining
1064 unpaired destinations to all relevant sources.  (For renames,
1065 only remaining unpaired sources are relevant; for copies, all
1066 original sources are relevant.)  For N sources and
1067 destinations, this exhaustive check is O(N^2).  This option
1068 prevents the exhaustive portion of rename/copy detection from
1069 running if the number of source/destination files involved
1070 exceeds the specified number.  Defaults to diff.renameLimit.
1071 Note that a value of 0 is treated as unlimited.</p>
1072 </dd>
1073 <dt class="hdlist1">--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;&#8203;[*]]</dt>
1074 <dd>
1075 <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
1076 Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
1077 type (i.e. regular file, symlink, submodule, &#8230;&#8203;) changed (<code>T</code>),
1078 are Unmerged (<code>U</code>), are
1079 Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
1080 Any combination of the filter characters (including none) can be used.
1081 When * (All-or-none) is added to the combination, all
1082 paths are selected if there is any file that matches
1083 other criteria in the comparison; if there is no file
1084 that matches other criteria, nothing is selected.</p>
1085 <div class="paragraph">
1086 <p>Also, these upper-case letters can be downcased to exclude.  E.g.
1087 <code>--diff-filter=ad</code> excludes added and deleted paths.</p>
1088 </div>
1089 <div class="paragraph">
1090 <p>Note that not all diffs can feature all types. For instance, copied and
1091 renamed entries cannot appear if detection for those types is disabled.</p>
1092 </div>
1093 </dd>
1094 <dt class="hdlist1">-S&lt;string&gt;</dt>
1095 <dd>
1096 <p>Look for differences that change the number of occurrences of
1097 the specified string (i.e. addition/deletion) in a file.
1098 Intended for the scripter&#8217;s use.</p>
1099 <div class="paragraph">
1100 <p>It is useful when you&#8217;re looking for an exact block of code (like a
1101 struct), and want to know the history of that block since it first
1102 came into being: use the feature iteratively to feed the interesting
1103 block in the preimage back into <code>-S</code>, and keep going until you get the
1104 very first version of the block.</p>
1105 </div>
1106 <div class="paragraph">
1107 <p>Binary files are searched as well.</p>
1108 </div>
1109 </dd>
1110 <dt class="hdlist1">-G&lt;regex&gt;</dt>
1111 <dd>
1112 <p>Look for differences whose patch text contains added/removed
1113 lines that match &lt;regex&gt;.</p>
1114 <div class="paragraph">
1115 <p>To illustrate the difference between <code>-S</code><em>&lt;regex&gt;</em> <code>--pickaxe-regex</code> and
1116 <code>-G</code><em>&lt;regex&gt;</em>, consider a commit with the following diff in the same
1117 file:</p>
1118 </div>
1119 <div class="listingblock">
1120 <div class="content">
1121 <pre>+    return frotz(nitfol, two-&gt;ptr, 1, 0);
1122 ...
1123 -    hit = frotz(nitfol, mf2.ptr, 1, 0);</pre>
1124 </div>
1125 </div>
1126 <div class="paragraph">
1127 <p>While <code>git</code> <code>log</code> <code>-G</code>"frotz\(<code>nitfol</code>" will show this commit, <code>git</code> <code>log</code>
1128 <code>-S</code>"frotz\(<code>nitfol</code>" <code>--pickaxe-regex</code> will not (because the number of
1129 occurrences of that string did not change).</p>
1130 </div>
1131 <div class="paragraph">
1132 <p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1133 filter will be ignored.</p>
1134 </div>
1135 <div class="paragraph">
1136 <p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1137 information.</p>
1138 </div>
1139 </dd>
1140 <dt class="hdlist1">--find-object=&lt;object-id&gt;</dt>
1141 <dd>
1142 <p>Look for differences that change the number of occurrences of
1143 the specified object. Similar to <code>-S</code>, just the argument is different
1144 in that it doesn&#8217;t search for a specific string but for a specific
1145 object id.</p>
1146 <div class="paragraph">
1147 <p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1148 <code>git-log</code> to also find trees.</p>
1149 </div>
1150 </dd>
1151 <dt class="hdlist1">--pickaxe-all</dt>
1152 <dd>
1153 <p>When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
1154 changeset, not just the files that contain the change
1155 in &lt;string&gt;.</p>
1156 </dd>
1157 <dt class="hdlist1">--pickaxe-regex</dt>
1158 <dd>
1159 <p>Treat the &lt;string&gt; given to <code>-S</code> as an extended POSIX regular
1160 expression to match.</p>
1161 </dd>
1162 <dt class="hdlist1">-O&lt;orderfile&gt;</dt>
1163 <dd>
1164 <p>Control the order in which files appear in the output.
1165 This overrides the <code>diff.orderFile</code> configuration variable
1166 (see <a href="git-config.html">git-config(1)</a>).  To cancel <code>diff.orderFile</code>,
1167 use <code>-O/dev/null</code>.</p>
1168 <div class="paragraph">
1169 <p>The output order is determined by the order of glob patterns in
1170 &lt;orderfile&gt;.
1171 All files with pathnames that match the first pattern are output
1172 first, all files with pathnames that match the second pattern (but not
1173 the first) are output next, and so on.
1174 All files with pathnames that do not match any pattern are output
1175 last, as if there was an implicit match-all pattern at the end of the
1176 file.
1177 If multiple pathnames have the same rank (they match the same pattern
1178 but no earlier patterns), their output order relative to each other is
1179 the normal order.</p>
1180 </div>
1181 <div class="paragraph">
1182 <p>&lt;orderfile&gt; is parsed as follows:</p>
1183 </div>
1184 <div class="openblock">
1185 <div class="content">
1186 <div class="ulist">
1187 <ul>
1188 <li>
1189 <p>Blank lines are ignored, so they can be used as separators for
1190 readability.</p>
1191 </li>
1192 <li>
1193 <p>Lines starting with a hash ("#") are ignored, so they can be used
1194 for comments.  Add a backslash ("\") to the beginning of the
1195 pattern if it starts with a hash.</p>
1196 </li>
1197 <li>
1198 <p>Each other line contains a single pattern.</p>
1199 </li>
1200 </ul>
1201 </div>
1202 </div>
1203 </div>
1204 <div class="paragraph">
1205 <p>Patterns have the same syntax and semantics as patterns used for
1206 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1207 matches a pattern if removing any number of the final pathname
1208 components matches the pattern.  For example, the pattern "<code>foo</code>*bar"
1209 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p>
1210 </div>
1211 </dd>
1212 <dt class="hdlist1">--skip-to=&lt;file&gt;</dt>
1213 <dt class="hdlist1">--rotate-to=&lt;file&gt;</dt>
1214 <dd>
1215 <p>Discard the files before the named &lt;file&gt; from the output
1216 (i.e. <em>skip to</em>), or move them to the end of the output
1217 (i.e. <em>rotate to</em>).  These options were invented primarily for the use
1218 of the <code>git</code> <code>difftool</code> command, and may not be very useful
1219 otherwise.</p>
1220 </dd>
1221 <dt class="hdlist1">-R</dt>
1222 <dd>
1223 <p>Swap two inputs; that is, show differences from index or
1224 on-disk file to tree contents.</p>
1225 </dd>
1226 <dt class="hdlist1">--relative[=&lt;path&gt;]</dt>
1227 <dt class="hdlist1">--no-relative</dt>
1228 <dd>
1229 <p>When run from a subdirectory of the project, it can be
1230 told to exclude changes outside the directory and show
1231 pathnames relative to it with this option.  When you are
1232 not in a subdirectory (e.g. in a bare repository), you
1233 can name which subdirectory to make the output relative
1234 to by giving a &lt;path&gt; as an argument.
1235 <code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config
1236 option and previous <code>--relative</code>.</p>
1237 </dd>
1238 <dt class="hdlist1">-a</dt>
1239 <dt class="hdlist1">--text</dt>
1240 <dd>
1241 <p>Treat all files as text.</p>
1242 </dd>
1243 <dt class="hdlist1">--ignore-cr-at-eol</dt>
1244 <dd>
1245 <p>Ignore carriage-return at the end of line when doing a comparison.</p>
1246 </dd>
1247 <dt class="hdlist1">--ignore-space-at-eol</dt>
1248 <dd>
1249 <p>Ignore changes in whitespace at EOL.</p>
1250 </dd>
1251 <dt class="hdlist1">-b</dt>
1252 <dt class="hdlist1">--ignore-space-change</dt>
1253 <dd>
1254 <p>Ignore changes in amount of whitespace.  This ignores whitespace
1255 at line end, and considers all other sequences of one or
1256 more whitespace characters to be equivalent.</p>
1257 </dd>
1258 <dt class="hdlist1">-w</dt>
1259 <dt class="hdlist1">--ignore-all-space</dt>
1260 <dd>
1261 <p>Ignore whitespace when comparing lines.  This ignores
1262 differences even if one line has whitespace where the other
1263 line has none.</p>
1264 </dd>
1265 <dt class="hdlist1">--ignore-blank-lines</dt>
1266 <dd>
1267 <p>Ignore changes whose lines are all blank.</p>
1268 </dd>
1269 <dt class="hdlist1">-I&lt;regex&gt;</dt>
1270 <dt class="hdlist1">--ignore-matching-lines=&lt;regex&gt;</dt>
1271 <dd>
1272 <p>Ignore changes whose all lines match &lt;regex&gt;.  This option may
1273 be specified more than once.</p>
1274 </dd>
1275 <dt class="hdlist1">--inter-hunk-context=&lt;lines&gt;</dt>
1276 <dd>
1277 <p>Show the context between diff hunks, up to the specified number
1278 of lines, thereby fusing hunks that are close to each other.
1279 Defaults to <code>diff.interHunkContext</code> or 0 if the config option
1280 is unset.</p>
1281 </dd>
1282 <dt class="hdlist1">-W</dt>
1283 <dt class="hdlist1">--function-context</dt>
1284 <dd>
1285 <p>Show whole function as context lines for each change.
1286 The function names are determined in the same way as
1287 <code>git</code> <code>diff</code> works out patch hunk headers (see <em>Defining a
1288 custom hunk-header</em> in <a href="gitattributes.html">gitattributes(5)</a>).</p>
1289 </dd>
1290 <dt class="hdlist1">--exit-code</dt>
1291 <dd>
1292 <p>Make the program exit with codes similar to diff(1).
1293 That is, it exits with 1 if there were differences and
1294 0 means no differences.</p>
1295 </dd>
1296 <dt class="hdlist1">--quiet</dt>
1297 <dd>
1298 <p>Disable all output of the program. Implies <code>--exit-code</code>.
1299 Disables execution of external diff helpers whose exit code
1300 is not trusted, i.e. their respective configuration option
1301 <code>diff.trustExitCode</code> or <code>diff.</code><em>&lt;driver&gt;</em><code>.trustExitCode</code> or
1302 environment variable <code>GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE</code> is
1303 false.</p>
1304 </dd>
1305 <dt class="hdlist1">--ext-diff</dt>
1306 <dd>
1307 <p>Allow an external diff helper to be executed. If you set an
1308 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
1309 to use this option with <a href="git-log.html">git-log(1)</a> and friends.</p>
1310 </dd>
1311 <dt class="hdlist1">--no-ext-diff</dt>
1312 <dd>
1313 <p>Disallow external diff drivers.</p>
1314 </dd>
1315 <dt class="hdlist1">--textconv</dt>
1316 <dt class="hdlist1">--no-textconv</dt>
1317 <dd>
1318 <p>Allow (or disallow) external text conversion filters to be run
1319 when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
1320 details. Because textconv filters are typically a one-way
1321 conversion, the resulting diff is suitable for human
1322 consumption, but cannot be applied. For this reason, textconv
1323 filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
1324 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1325 diff plumbing commands.</p>
1326 </dd>
1327 <dt class="hdlist1">--ignore-submodules[=&lt;when&gt;]</dt>
1328 <dd>
1329 <p>Ignore changes to submodules in the diff generation. &lt;when&gt; can be
1330 either "none", "untracked", "dirty" or "all", which is the default.
1331 Using "none" will consider the submodule modified when it either contains
1332 untracked or modified files or its HEAD differs from the commit recorded
1333 in the superproject and can be used to override any settings of the
1334 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1335 "untracked" is used submodules are not considered dirty when they only
1336 contain untracked content (but they are still scanned for modified
1337 content). Using "dirty" ignores all changes to the work tree of submodules,
1338 only changes to the commits stored in the superproject are shown (this was
1339 the behavior until 1.7.0). Using "all" hides all changes to submodules.</p>
1340 </dd>
1341 <dt class="hdlist1">--src-prefix=&lt;prefix&gt;</dt>
1342 <dd>
1343 <p>Show the given source prefix instead of "a/".</p>
1344 </dd>
1345 <dt class="hdlist1">--dst-prefix=&lt;prefix&gt;</dt>
1346 <dd>
1347 <p>Show the given destination prefix instead of "b/".</p>
1348 </dd>
1349 <dt class="hdlist1">--no-prefix</dt>
1350 <dd>
1351 <p>Do not show any source or destination prefix.</p>
1352 </dd>
1353 <dt class="hdlist1">--default-prefix</dt>
1354 <dd>
1355 <p>Use the default source and destination prefixes ("a/" and "b/").
1356 This overrides configuration variables such as <code>diff.noprefix</code>,
1357 <code>diff.srcPrefix</code>, <code>diff.dstPrefix</code>, and <code>diff.mnemonicPrefix</code>
1358 (see <code>git-config</code>(1)).</p>
1359 </dd>
1360 <dt class="hdlist1">--line-prefix=&lt;prefix&gt;</dt>
1361 <dd>
1362 <p>Prepend an additional prefix to every line of output.</p>
1363 </dd>
1364 <dt class="hdlist1">--ita-invisible-in-index</dt>
1365 <dd>
1366 <p>By default entries added by "git add -N" appear as an existing
1367 empty file in "git diff" and a new file in "git diff --cached".
1368 This option makes the entry appear as a new file in "git diff"
1369 and non-existent in "git diff --cached". This option could be
1370 reverted with <code>--ita-visible-in-index</code>. Both options are
1371 experimental and could be removed in future.</p>
1372 </dd>
1373 </dl>
1374 </div>
1375 <div class="paragraph">
1376 <p>For more detailed explanation on these common options, see also
1377 <a href="gitdiffcore.html">gitdiffcore(7)</a>.</p>
1378 </div>
1379 <div class="dlist">
1380 <dl>
1381 <dt class="hdlist1">&lt;tree-ish&gt;</dt>
1382 <dd>
1383 <p>The id of a tree object to diff against.</p>
1384 </dd>
1385 <dt class="hdlist1">--cached</dt>
1386 <dd>
1387 <p>Do not consider the on-disk file at all.</p>
1388 </dd>
1389 <dt class="hdlist1">--merge-base</dt>
1390 <dd>
1391 <p>Instead of comparing &lt;tree-ish&gt; directly, use the merge base
1392 between &lt;tree-ish&gt; and HEAD instead.  &lt;tree-ish&gt; must be a
1393 commit.</p>
1394 </dd>
1395 <dt class="hdlist1">-m</dt>
1396 <dd>
1397 <p>By default, files recorded in the index but not checked
1398 out are reported as deleted.  This flag makes
1399 <em>git diff-index</em> say that all non-checked-out files are up
1400 to date.</p>
1401 </dd>
1402 </dl>
1403 </div>
1404 </div>
1405 </div>
1406 <div class="sect1">
1407 <h2 id="_raw_output_format">Raw output format</h2>
1408 <div class="sectionbody">
1409 <div class="paragraph">
1410 <p>The raw output format from "git-diff-index", "git-diff-tree",
1411 "git-diff-files" and "git diff --raw" are very similar.</p>
1412 </div>
1413 <div class="paragraph">
1414 <p>These commands all compare two sets of things; what is
1415 compared differs:</p>
1416 </div>
1417 <div class="dlist">
1418 <dl>
1419 <dt class="hdlist1">git-diff-index &lt;tree-ish&gt;</dt>
1420 <dd>
1421 <p>compares the &lt;tree-ish&gt; and the files on the filesystem.</p>
1422 </dd>
1423 <dt class="hdlist1">git-diff-index --cached &lt;tree-ish&gt;</dt>
1424 <dd>
1425 <p>compares the &lt;tree-ish&gt; and the index.</p>
1426 </dd>
1427 <dt class="hdlist1">git-diff-tree [-r] &lt;tree-ish-1&gt; &lt;tree-ish-2&gt; [&lt;pattern&gt;&#8230;&#8203;]</dt>
1428 <dd>
1429 <p>compares the trees named by the two arguments.</p>
1430 </dd>
1431 <dt class="hdlist1">git-diff-files [&lt;pattern&gt;&#8230;&#8203;]</dt>
1432 <dd>
1433 <p>compares the index and the files on the filesystem.</p>
1434 </dd>
1435 </dl>
1436 </div>
1437 <div class="paragraph">
1438 <p>The "git-diff-tree" command begins its output by printing the hash of
1439 what is being compared. After that, all the commands print one output
1440 line per changed file.</p>
1441 </div>
1442 <div class="paragraph">
1443 <p>An output line is formatted this way:</p>
1444 </div>
1445 <div class="listingblock">
1446 <div class="content">
1447 <pre>in-place edit  :100644 100644 bcd1234 0123456 M file0
1448 copy-edit      :100644 100644 abcd123 1234567 C68 file1 file2
1449 rename-edit    :100644 100644 abcd123 1234567 R86 file1 file3
1450 create         :000000 100644 0000000 1234567 A file4
1451 delete         :100644 000000 1234567 0000000 D file5
1452 unmerged       :000000 000000 0000000 0000000 U file6</pre>
1453 </div>
1454 </div>
1455 <div class="paragraph">
1456 <p>That is, from the left to the right:</p>
1457 </div>
1458 <div class="olist arabic">
1459 <ol class="arabic">
1460 <li>
1461 <p>a colon.</p>
1462 </li>
1463 <li>
1464 <p>mode for "src"; 000000 if creation or unmerged.</p>
1465 </li>
1466 <li>
1467 <p>a space.</p>
1468 </li>
1469 <li>
1470 <p>mode for "dst"; 000000 if deletion or unmerged.</p>
1471 </li>
1472 <li>
1473 <p>a space.</p>
1474 </li>
1475 <li>
1476 <p>sha1 for "src"; 0{40} if creation or unmerged.</p>
1477 </li>
1478 <li>
1479 <p>a space.</p>
1480 </li>
1481 <li>
1482 <p>sha1 for "dst"; 0{40} if deletion, unmerged or "work tree out of sync with the index".</p>
1483 </li>
1484 <li>
1485 <p>a space.</p>
1486 </li>
1487 <li>
1488 <p>status, followed by optional "score" number.</p>
1489 </li>
1490 <li>
1491 <p>a tab or a NUL when <code>-z</code> option is used.</p>
1492 </li>
1493 <li>
1494 <p>path for "src"</p>
1495 </li>
1496 <li>
1497 <p>a tab or a NUL when <code>-z</code> option is used; only exists for C or R.</p>
1498 </li>
1499 <li>
1500 <p>path for "dst"; only exists for C or R.</p>
1501 </li>
1502 <li>
1503 <p>an LF or a NUL when <code>-z</code> option is used, to terminate the record.</p>
1504 </li>
1505 </ol>
1506 </div>
1507 <div class="paragraph">
1508 <p>Possible status letters are:</p>
1509 </div>
1510 <div class="ulist">
1511 <ul>
1512 <li>
1513 <p>A: addition of a file</p>
1514 </li>
1515 <li>
1516 <p>C: copy of a file into a new one</p>
1517 </li>
1518 <li>
1519 <p>D: deletion of a file</p>
1520 </li>
1521 <li>
1522 <p>M: modification of the contents or mode of a file</p>
1523 </li>
1524 <li>
1525 <p>R: renaming of a file</p>
1526 </li>
1527 <li>
1528 <p>T: change in the type of the file (regular file, symbolic link or submodule)</p>
1529 </li>
1530 <li>
1531 <p>U: file is unmerged (you must complete the merge before it can
1532 be committed)</p>
1533 </li>
1534 <li>
1535 <p>X: "unknown" change type (most probably a bug, please report it)</p>
1536 </li>
1537 </ul>
1538 </div>
1539 <div class="paragraph">
1540 <p>Status letters C and R are always followed by a score (denoting the
1541 percentage of similarity between the source and target of the move or
1542 copy).  Status letter M may be followed by a score (denoting the
1543 percentage of dissimilarity) for file rewrites.</p>
1544 </div>
1545 <div class="paragraph">
1546 <p>The sha1 for "dst" is shown as all 0&#8217;s if a file on the filesystem
1547 is out of sync with the index.</p>
1548 </div>
1549 <div class="paragraph">
1550 <p>Example:</p>
1551 </div>
1552 <div class="listingblock">
1553 <div class="content">
1554 <pre>:100644 100644 5be4a4a 0000000 M file.c</pre>
1555 </div>
1556 </div>
1557 <div class="paragraph">
1558 <p>Without the <code>-z</code> option, pathnames with "unusual" characters are
1559 quoted as explained for the configuration variable <code>core.quotePath</code>
1560 (see <a href="git-config.html">git-config(1)</a>).  Using <code>-z</code> the filename is output
1561 verbatim and the line is terminated by a NUL byte.</p>
1562 </div>
1563 </div>
1564 </div>
1565 <div class="sect1">
1566 <h2 id="_diff_format_for_merges">diff format for merges</h2>
1567 <div class="sectionbody">
1568 <div class="paragraph">
1569 <p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
1570 can take <code>-c</code> or <code>--cc</code> option
1571 to generate diff output also for merge commits.  The output differs
1572 from the format described above in the following way:</p>
1573 </div>
1574 <div class="olist arabic">
1575 <ol class="arabic">
1576 <li>
1577 <p>there is a colon for each parent</p>
1578 </li>
1579 <li>
1580 <p>there are more "src" modes and "src" sha1</p>
1581 </li>
1582 <li>
1583 <p>status is concatenated status characters for each parent</p>
1584 </li>
1585 <li>
1586 <p>no optional "score" number</p>
1587 </li>
1588 <li>
1589 <p>tab-separated pathname(s) of the file</p>
1590 </li>
1591 </ol>
1592 </div>
1593 <div class="paragraph">
1594 <p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
1595 if the file was renamed on any side of history.  With
1596 <code>--combined-all-paths</code>, the name of the path in each parent is shown
1597 followed by the name of the path in the merge commit.</p>
1598 </div>
1599 <div class="paragraph">
1600 <p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p>
1601 </div>
1602 <div class="listingblock">
1603 <div class="content">
1604 <pre>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM       desc.c
1605 ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM       bar.sh
1606 ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR       phooey.c</pre>
1607 </div>
1608 </div>
1609 <div class="paragraph">
1610 <p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p>
1611 </div>
1612 <div class="listingblock">
1613 <div class="content">
1614 <pre>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM       desc.c  desc.c  desc.c
1615 ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM       foo.sh  bar.sh  bar.sh
1616 ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR       fooey.c fuey.c  phooey.c</pre>
1617 </div>
1618 </div>
1619 <div class="paragraph">
1620 <p>Note that <em>combined diff</em> lists only files which were modified from
1621 all parents.</p>
1622 </div>
1623 </div>
1624 </div>
1625 <div class="sect1">
1626 <h2 id="generate_patch_text_with_p">Generating patch text with -p</h2>
1627 <div class="sectionbody">
1628 <div class="paragraph">
1629 <p>Running
1630 <a href="git-diff.html">git-diff(1)</a>,
1631 <a href="git-log.html">git-log(1)</a>,
1632 <a href="git-show.html">git-show(1)</a>,
1633 <a href="git-diff-index.html">git-diff-index(1)</a>,
1634 <a href="git-diff-tree.html">git-diff-tree(1)</a>, or
1635 <a href="git-diff-files.html">git-diff-files(1)</a>
1636 with the <code>-p</code> option produces patch text.
1637 You can customize the creation of patch text via the
1638 <code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables
1639 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p>
1640 </div>
1641 <div class="paragraph">
1642 <p>What the -p option produces is slightly different from the traditional
1643 diff format:</p>
1644 </div>
1645 <div class="olist arabic">
1646 <ol class="arabic">
1647 <li>
1648 <p>It is preceded by a "git diff" header that looks like this:</p>
1649 <div class="literalblock">
1650 <div class="content">
1651 <pre>diff --git a/file1 b/file2</pre>
1652 </div>
1653 </div>
1654 <div class="paragraph">
1655 <p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
1656 involved.  Especially, even for a creation or a deletion,
1657 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p>
1658 </div>
1659 <div class="paragraph">
1660 <p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
1661 name of the source file of the rename/copy and the name of
1662 the file that the rename/copy produces, respectively.</p>
1663 </div>
1664 </li>
1665 <li>
1666 <p>It is followed by one or more extended header lines:</p>
1667 <div class="literalblock">
1668 <div class="content">
1669 <pre>old mode &lt;mode&gt;
1670 new mode &lt;mode&gt;
1671 deleted file mode &lt;mode&gt;
1672 new file mode &lt;mode&gt;
1673 copy from &lt;path&gt;
1674 copy to &lt;path&gt;
1675 rename from &lt;path&gt;
1676 rename to &lt;path&gt;
1677 similarity index &lt;number&gt;
1678 dissimilarity index &lt;number&gt;
1679 index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</pre>
1680 </div>
1681 </div>
1682 <div class="paragraph">
1683 <p>File modes are printed as 6-digit octal numbers including the file type
1684 and file permission bits.</p>
1685 </div>
1686 <div class="paragraph">
1687 <p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p>
1688 </div>
1689 <div class="paragraph">
1690 <p>The similarity index is the percentage of unchanged lines, and
1691 the dissimilarity index is the percentage of changed lines.  It
1692 is a rounded down integer, followed by a percent sign.  The
1693 similarity index value of 100% is thus reserved for two equal
1694 files, while 100% dissimilarity means that no line from the old
1695 file made it into the new one.</p>
1696 </div>
1697 <div class="paragraph">
1698 <p>The index line includes the blob object names before and after the change.
1699 The &lt;mode&gt; is included if the file mode does not change; otherwise,
1700 separate lines indicate the old and the new mode.</p>
1701 </div>
1702 </li>
1703 <li>
1704 <p>Pathnames with "unusual" characters are quoted as explained for
1705 the configuration variable <code>core.quotePath</code> (see
1706 <a href="git-config.html">git-config(1)</a>).</p>
1707 </li>
1708 <li>
1709 <p>All the <code>file1</code> files in the output refer to files before the
1710 commit, and all the <code>file2</code> files refer to files after the commit.
1711 It is incorrect to apply each change to each file sequentially.  For
1712 example, this patch will swap a and b:</p>
1713 <div class="literalblock">
1714 <div class="content">
1715 <pre>diff --git a/a b/b
1716 rename from a
1717 rename to b
1718 diff --git a/b b/a
1719 rename from b
1720 rename to a</pre>
1721 </div>
1722 </div>
1723 </li>
1724 <li>
1725 <p>Hunk headers mention the name of the function to which the hunk
1726 applies.  See "Defining a custom hunk-header" in
1727 <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
1728 specific languages.</p>
1729 </li>
1730 </ol>
1731 </div>
1732 </div>
1733 </div>
1734 <div class="sect1">
1735 <h2 id="_combined_diff_format">Combined diff format</h2>
1736 <div class="sectionbody">
1737 <div class="paragraph">
1738 <p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
1739 produce a <em>combined diff</em> when showing a merge. This is the default
1740 format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
1741 <a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
1742 <code>--diff-merges</code> option to any of these commands to force generation of
1743 diffs in a specific format.</p>
1744 </div>
1745 <div class="paragraph">
1746 <p>A "combined diff" format looks like this:</p>
1747 </div>
1748 <div class="listingblock">
1749 <div class="content">
1750 <pre>diff --combined describe.c
1751 index fabadb8,cc95eb0..4866510
1752 --- a/describe.c
1753 +++ b/describe.c
1754 @@@ -98,20 -98,12 +98,20 @@@
1755         return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
1756   }
1757
1758 - static void describe(char *arg)
1759  -static void describe(struct commit *cmit, int last_one)
1760 ++static void describe(char *arg, int last_one)
1761   {
1762  +      unsigned char sha1[20];
1763  +      struct commit *cmit;
1764         struct commit_list *list;
1765         static int initialized = 0;
1766         struct commit_name *n;
1767
1768  +      if (get_sha1(arg, sha1) &lt; 0)
1769  +              usage(describe_usage);
1770  +      cmit = lookup_commit_reference(sha1);
1771  +      if (!cmit)
1772  +              usage(describe_usage);
1773  +
1774         if (!initialized) {
1775                 initialized = 1;
1776                 for_each_ref(get_name);</pre>
1777 </div>
1778 </div>
1779 <div class="olist arabic">
1780 <ol class="arabic">
1781 <li>
1782 <p>It is preceded by a "git diff" header, that looks like
1783 this (when the <code>-c</code> option is used):</p>
1784 <div class="literalblock">
1785 <div class="content">
1786 <pre>diff --combined file</pre>
1787 </div>
1788 </div>
1789 <div class="paragraph">
1790 <p>or like this (when the <code>--cc</code> option is used):</p>
1791 </div>
1792 <div class="literalblock">
1793 <div class="content">
1794 <pre>diff --cc file</pre>
1795 </div>
1796 </div>
1797 </li>
1798 <li>
1799 <p>It is followed by one or more extended header lines
1800 (this example shows a merge with two parents):</p>
1801 <div class="literalblock">
1802 <div class="content">
1803 <pre>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
1804 mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
1805 new file mode &lt;mode&gt;
1806 deleted file mode &lt;mode&gt;,&lt;mode&gt;</pre>
1807 </div>
1808 </div>
1809 <div class="paragraph">
1810 <p>The <code>mode</code> <em>&lt;mode&gt;</em><code>,</code><em>&lt;mode&gt;</em><code>..</code><em>&lt;mode&gt;</em> line appears only if at least one of
1811 the &lt;mode&gt; is different from the rest. Extended headers with
1812 information about detected content movement (renames and
1813 copying detection) are designed to work with the diff of two
1814 &lt;tree-ish&gt; and are not used by combined diff format.</p>
1815 </div>
1816 </li>
1817 <li>
1818 <p>It is followed by a two-line from-file/to-file header:</p>
1819 <div class="literalblock">
1820 <div class="content">
1821 <pre>--- a/file
1822 +++ b/file</pre>
1823 </div>
1824 </div>
1825 <div class="paragraph">
1826 <p>Similar to the two-line header for the traditional <em>unified</em> diff
1827 format, <code>/dev/null</code> is used to signal created or deleted
1828 files.</p>
1829 </div>
1830 <div class="paragraph">
1831 <p>However, if the --combined-all-paths option is provided, instead of a
1832 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
1833 where N is the number of parents in the merge commit:</p>
1834 </div>
1835 <div class="literalblock">
1836 <div class="content">
1837 <pre>--- a/file
1838 --- a/file
1839 --- a/file
1840 +++ b/file</pre>
1841 </div>
1842 </div>
1843 <div class="paragraph">
1844 <p>This extended format can be useful if rename or copy detection is
1845 active, to allow you to see the original name of the file in different
1846 parents.</p>
1847 </div>
1848 </li>
1849 <li>
1850 <p>Chunk header format is modified to prevent people from
1851 accidentally feeding it to <code>patch</code> <code>-p1</code>. Combined diff format
1852 was created for review of merge commit changes, and was not
1853 meant to be applied. The change is similar to the change in the
1854 extended <em>index</em> header:</p>
1855 <div class="literalblock">
1856 <div class="content">
1857 <pre>@@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@</pre>
1858 </div>
1859 </div>
1860 <div class="paragraph">
1861 <p>There are (number of parents + 1) <code>@</code> characters in the chunk
1862 header for combined diff format.</p>
1863 </div>
1864 </li>
1865 </ol>
1866 </div>
1867 <div class="paragraph">
1868 <p>Unlike the traditional <em>unified</em> diff format, which shows two
1869 files A and B with a single column that has <code>-</code> (minus&#8201;&#8212;&#8201;appears in A but removed in B), <code>+</code> (plus&#8201;&#8212;&#8201;missing in A but
1870 added to B), or " " (space&#8201;&#8212;&#8201;unchanged) prefix, this format
1871 compares two or more files file1, file2,&#8230;&#8203; with one file X, and
1872 shows how X differs from each of fileN.  One column for each of
1873 fileN is prepended to the output line to note how X&#8217;s line is
1874 different from it.</p>
1875 </div>
1876 <div class="paragraph">
1877 <p>A <code>-</code> character in the column N means that the line appears in
1878 fileN but it does not appear in the result.  A <code>+</code> character
1879 in the column N means that the line appears in the result,
1880 and fileN does not have that line (in other words, the line was
1881 added, from the point of view of that parent).</p>
1882 </div>
1883 <div class="paragraph">
1884 <p>In the above example output, the function signature was changed
1885 from both files (hence two <code>-</code> removals from both file1 and
1886 file2, plus <code>++</code> to mean one line that was added does not appear
1887 in either file1 or file2).  Also, eight other lines are the same
1888 from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p>
1889 </div>
1890 <div class="paragraph">
1891 <p>When shown by <code>git</code> <code>diff-tree</code> <code>-c</code>, it compares the parents of a
1892 merge commit with the merge result (i.e. file1..fileN are the
1893 parents).  When shown by <code>git</code> <code>diff-files</code> <code>-c</code>, it compares the
1894 two unresolved merge parents with the working tree file
1895 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
1896 "their version").</p>
1897 </div>
1898 </div>
1899 </div>
1900 <div class="sect1">
1901 <h2 id="_other_diff_formats">other diff formats</h2>
1902 <div class="sectionbody">
1903 <div class="paragraph">
1904 <p>The <code>--summary</code> option describes newly added, deleted, renamed and
1905 copied files.  The <code>--stat</code> option adds diffstat(1) graph to the
1906 output.  These options can be combined with other options, such as
1907 <code>-p</code>, and are meant for human consumption.</p>
1908 </div>
1909 <div class="paragraph">
1910 <p>When showing a change that involves a rename or a copy, <code>--stat</code> output
1911 formats the pathnames compactly by combining common prefix and suffix of
1912 the pathnames.  For example, a change that moves <code>arch/i386/Makefile</code> to
1913 <code>arch/x86/Makefile</code> while modifying 4 lines will be shown like this:</p>
1914 </div>
1915 <div class="listingblock">
1916 <div class="content">
1917 <pre>arch/{i386 =&gt; x86}/Makefile    |   4 +--</pre>
1918 </div>
1919 </div>
1920 <div class="paragraph">
1921 <p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
1922 for easier machine consumption.  An entry in <code>--numstat</code> output looks
1923 like this:</p>
1924 </div>
1925 <div class="listingblock">
1926 <div class="content">
1927 <pre>1       2       README
1928 3       1       arch/{i386 =&gt; x86}/Makefile</pre>
1929 </div>
1930 </div>
1931 <div class="paragraph">
1932 <p>That is, from left to right:</p>
1933 </div>
1934 <div class="olist arabic">
1935 <ol class="arabic">
1936 <li>
1937 <p>the number of added lines;</p>
1938 </li>
1939 <li>
1940 <p>a tab;</p>
1941 </li>
1942 <li>
1943 <p>the number of deleted lines;</p>
1944 </li>
1945 <li>
1946 <p>a tab;</p>
1947 </li>
1948 <li>
1949 <p>pathname (possibly with rename/copy information);</p>
1950 </li>
1951 <li>
1952 <p>a newline.</p>
1953 </li>
1954 </ol>
1955 </div>
1956 <div class="paragraph">
1957 <p>When <code>-z</code> output option is in effect, the output is formatted this way:</p>
1958 </div>
1959 <div class="listingblock">
1960 <div class="content">
1961 <pre>1       2       README NUL
1962 3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</pre>
1963 </div>
1964 </div>
1965 <div class="paragraph">
1966 <p>That is:</p>
1967 </div>
1968 <div class="olist arabic">
1969 <ol class="arabic">
1970 <li>
1971 <p>the number of added lines;</p>
1972 </li>
1973 <li>
1974 <p>a tab;</p>
1975 </li>
1976 <li>
1977 <p>the number of deleted lines;</p>
1978 </li>
1979 <li>
1980 <p>a tab;</p>
1981 </li>
1982 <li>
1983 <p>a NUL (only exists if renamed/copied);</p>
1984 </li>
1985 <li>
1986 <p>pathname in preimage;</p>
1987 </li>
1988 <li>
1989 <p>a NUL (only exists if renamed/copied);</p>
1990 </li>
1991 <li>
1992 <p>pathname in postimage (only exists if renamed/copied);</p>
1993 </li>
1994 <li>
1995 <p>a NUL.</p>
1996 </li>
1997 </ol>
1998 </div>
1999 <div class="paragraph">
2000 <p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
2001 scripts that read the output to tell if the current record being read is
2002 a single-path record or a rename/copy record without reading ahead.
2003 After reading added and deleted lines, reading up to <code>NUL</code> would yield
2004 the pathname, but if that is <code>NUL</code>, the record will show two paths.</p>
2005 </div>
2006 </div>
2007 </div>
2008 <div class="sect1">
2009 <h2 id="_operating_modes">OPERATING MODES</h2>
2010 <div class="sectionbody">
2011 <div class="paragraph">
2012 <p>You can choose whether you want to trust the index file entirely
2013 (using the <code>--cached</code> flag) or ask the diff logic to show any files
2014 that don&#8217;t match the stat state as being "tentatively changed".  Both
2015 of these operations are very useful indeed.</p>
2016 </div>
2017 </div>
2018 </div>
2019 <div class="sect1">
2020 <h2 id="_cached_mode">CACHED MODE</h2>
2021 <div class="sectionbody">
2022 <div class="paragraph">
2023 <p>If <code>--cached</code> is specified, it allows you to ask:</p>
2024 </div>
2025 <div class="literalblock">
2026 <div class="content">
2027 <pre>show me the differences between HEAD and the current index
2028 contents (the ones I'd write using 'git write-tree')</pre>
2029 </div>
2030 </div>
2031 <div class="paragraph">
2032 <p>For example, let&#8217;s say that you have worked on your working directory, updated
2033 some files in the index and are ready to commit. You want to see exactly
2034 <strong>what</strong> you are going to commit, without having to write a new tree
2035 object and compare it that way, and to do that, you just do</p>
2036 </div>
2037 <div class="literalblock">
2038 <div class="content">
2039 <pre>git diff-index --cached HEAD</pre>
2040 </div>
2041 </div>
2042 <div class="paragraph">
2043 <p>Example: let&#8217;s say I had renamed <code>commit.c</code> to <code>git-commit.c</code>, and I had
2044 done an <code>update-index</code> to make that effective in the index file.
2045 <code>git</code> <code>diff-files</code> wouldn&#8217;t show anything at all, since the index file
2046 matches my working directory. But doing a <em>git diff-index</em> does:</p>
2047 </div>
2048 <div class="literalblock">
2049 <div class="content">
2050 <pre>torvalds@ppc970:~/git&gt; git diff-index --cached HEAD
2051 :100644 000000 4161aecc6700a2eb579e842af0b7f22b98443f74 0000000000000000000000000000000000000000 D      commit.c
2052 :000000 100644 0000000000000000000000000000000000000000 4161aecc6700a2eb579e842af0b7f22b98443f74 A      git-commit.c</pre>
2053 </div>
2054 </div>
2055 <div class="paragraph">
2056 <p>You can see easily that the above is a rename.</p>
2057 </div>
2058 <div class="paragraph">
2059 <p>In fact, <code>git</code> <code>diff-index</code> <code>--cached</code> <strong>should</strong> always be entirely equivalent to
2060 actually doing a <em>git write-tree</em> and comparing that. Except this one is much
2061 nicer for the case where you just want to check where you are.</p>
2062 </div>
2063 <div class="paragraph">
2064 <p>So doing a <code>git</code> <code>diff-index</code> <code>--cached</code> is basically very useful when you are
2065 asking yourself "what have I already marked for being committed, and
2066 what&#8217;s the difference to a previous tree".</p>
2067 </div>
2068 </div>
2069 </div>
2070 <div class="sect1">
2071 <h2 id="_non_cached_mode">NON-CACHED MODE</h2>
2072 <div class="sectionbody">
2073 <div class="paragraph">
2074 <p>The "non-cached" mode takes a different approach, and is potentially
2075 the more useful of the two in that what it does can&#8217;t be emulated with
2076 a <em>git write-tree</em> + <em>git diff-tree</em>. Thus that&#8217;s the default mode.
2077 The non-cached version asks the question:</p>
2078 </div>
2079 <div class="literalblock">
2080 <div class="content">
2081 <pre>show me the differences between HEAD and the currently checked out
2082 tree - index contents _and_ files that aren't up to date</pre>
2083 </div>
2084 </div>
2085 <div class="paragraph">
2086 <p>which is obviously a very useful question too, since that tells you what
2087 you <strong>could</strong> commit. Again, the output matches the <em>git diff-tree -r</em>
2088 output to a tee, but with a twist.</p>
2089 </div>
2090 <div class="paragraph">
2091 <p>The twist is that if some file doesn&#8217;t match the index, we don&#8217;t have
2092 a backing store thing for it, and we use the magic "all-zero" sha1 to
2093 show that. So let&#8217;s say that you have edited <code>kernel/sched.c</code>, but
2094 have not actually done a <em>git update-index</em> on it yet - there is no
2095 "object" associated with the new state, and you get:</p>
2096 </div>
2097 <div class="literalblock">
2098 <div class="content">
2099 <pre>torvalds@ppc970:~/v2.6/linux&gt; git diff-index --abbrev HEAD
2100 :100644 100644 7476bb5ba 000000000 M    kernel/sched.c</pre>
2101 </div>
2102 </div>
2103 <div class="paragraph">
2104 <p>i.e., it shows that the tree has changed, and that <code>kernel/sched.c</code> is
2105 not up to date and may contain new stuff. The all-zero sha1 means that to
2106 get the real diff, you need to look at the object in the working directory
2107 directly rather than do an object-to-object diff.</p>
2108 </div>
2109 <div class="admonitionblock note">
2110 <table>
2111 <tr>
2112 <td class="icon">
2113 <div class="title">Note</div>
2114 </td>
2115 <td class="content">
2116 As with other commands of this type, <em>git diff-index</em> does not
2117 actually look at the contents of the file at all. So maybe
2118 <code>kernel/sched.c</code> hasn&#8217;t actually changed, and it&#8217;s just that you
2119 touched it. In either case, it&#8217;s a note that you need to
2120 <em>git update-index</em> it to make the index be in sync.
2121 </td>
2122 </tr>
2123 </table>
2124 </div>
2125 <div class="admonitionblock note">
2126 <table>
2127 <tr>
2128 <td class="icon">
2129 <div class="title">Note</div>
2130 </td>
2131 <td class="content">
2132 You can have a mixture of files show up as "has been updated"
2133 and "is still dirty in the working directory" together. You can always
2134 tell which file is in which state, since the "has been updated" ones
2135 show a valid sha1, and the "not in sync with the index" ones will
2136 always have the special all-zero sha1.
2137 </td>
2138 </tr>
2139 </table>
2140 </div>
2141 </div>
2142 </div>
2143 <div class="sect1">
2144 <h2 id="_git">GIT</h2>
2145 <div class="sectionbody">
2146 <div class="paragraph">
2147 <p>Part of the <a href="git.html">git(1)</a> suite</p>
2148 </div>
2149 </div>
2150 </div>
2151 </div>
2152 <div id="footer">
2153 <div id="footer-text">
2154 Last updated 2023-10-23 14:43:46 -0700
2155 </div>
2156 </div>
2157 </body>
2158 </html>