git-show.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-show(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-show(1) Manual Page</h1>
 444 <h2 id="_name">NAME</h2>
 445 <div class="sectionbody">
 446 <p>git-show - Show various types of objects</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 show</em> [&lt;options&gt;] [&lt;object&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>Shows one or more objects (blobs, trees, tags and commits).</p>
 463 </div>
 464 <div class="paragraph">
 465 <p>For commits it shows the log message and textual diff. It also
 466 presents the merge commit in a special format as produced by
 467 <em>git diff-tree --cc</em>.</p>
 468 </div>
 469 <div class="paragraph">
 470 <p>For tags, it shows the tag message and the referenced objects.</p>
 471 </div>
 472 <div class="paragraph">
 473 <p>For trees, it shows the names (equivalent to <em>git ls-tree</em>
 474 with --name-only).</p>
 475 </div>
 476 <div class="paragraph">
 477 <p>For plain blobs, it shows the plain contents.</p>
 478 </div>
 479 <div class="paragraph">
 480 <p>Some options that <em>git log</em> command understands can be used to
 481 control how the changes the commit introduces are shown.</p>
 482 </div>
 483 <div class="paragraph">
 484 <p>This manual page describes only the most frequently used options.</p>
 485 </div>
 486 </div>
 487 </div>
 488 <div class="sect1">
 489 <h2 id="_options">OPTIONS</h2>
 490 <div class="sectionbody">
 491 <div class="dlist">
 492 <dl>
 493 <dt class="hdlist1">&lt;object&gt;&#8230;&#8203;</dt>
 494 <dd>
 495 <p>The names of objects to show (defaults to <em>HEAD</em>).
 496 For a more complete list of ways to spell object names, see
 497 "SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p>
 498 </dd>
 499 <dt class="hdlist1">--pretty[=&lt;format&gt;]</dt>
 500 <dt class="hdlist1">--format=&lt;format&gt;</dt>
 501 <dd>
 502 <p>Pretty-print the contents of the commit logs in a given format,
 503 where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
 504 <em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:&lt;string&gt;</em>
 505 and <em>tformat:&lt;string&gt;</em>.  When <em>&lt;format&gt;</em> is none of the above,
 506 and has <em>%placeholder</em> in it, it acts as if
 507 <em>--pretty=tformat:&lt;format&gt;</em> were given.</p>
 508 <div class="paragraph">
 509 <p>See the "PRETTY FORMATS" section for some additional details for each
 510 format.  When <em>=&lt;format&gt;</em> part is omitted, it defaults to <em>medium</em>.</p>
 511 </div>
 512 <div class="paragraph">
 513 <p>Note: you can specify the default pretty format in the repository
 514 configuration (see <a href="git-config.html">git-config(1)</a>).</p>
 515 </div>
 516 </dd>
 517 <dt class="hdlist1">--abbrev-commit</dt>
 518 <dd>
 519 <p>Instead of showing the full 40-byte hexadecimal commit object
 520 name, show a prefix that names the object uniquely.
 521 "--abbrev=&lt;n&gt;" (which also modifies diff output, if it is displayed)
 522 option can be used to specify the minimum length of the prefix.</p>
 523 <div class="paragraph">
 524 <p>This should make "--pretty=oneline" a whole lot more readable for
 525 people using 80-column terminals.</p>
 526 </div>
 527 </dd>
 528 <dt class="hdlist1">--no-abbrev-commit</dt>
 529 <dd>
 530 <p>Show the full 40-byte hexadecimal commit object name. This negates
 531 <code>--abbrev-commit</code>, either explicit or implied by other options such
 532 as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.</p>
 533 </dd>
 534 <dt class="hdlist1">--oneline</dt>
 535 <dd>
 536 <p>This is a shorthand for "--pretty=oneline --abbrev-commit"
 537 used together.</p>
 538 </dd>
 539 <dt class="hdlist1">--encoding=&lt;encoding&gt;</dt>
 540 <dd>
 541 <p>Commit objects record the character encoding used for the log message
 542 in their encoding header; this option can be used to tell the
 543 command to re-code the commit log message in the encoding
 544 preferred by the user.  For non plumbing commands this
 545 defaults to UTF-8. Note that if an object claims to be encoded
 546 in <code>X</code> and we are outputting in <code>X</code>, we will output the object
 547 verbatim; this means that invalid sequences in the original
 548 commit may be copied to the output. Likewise, if iconv(3) fails
 549 to convert the commit, we will quietly output the original
 550 object verbatim.</p>
 551 </dd>
 552 <dt class="hdlist1">--expand-tabs=&lt;n&gt;</dt>
 553 <dt class="hdlist1">--expand-tabs</dt>
 554 <dt class="hdlist1">--no-expand-tabs</dt>
 555 <dd>
 556 <p>Perform a tab expansion (replace each tab with enough spaces
 557 to fill to the next display column that is a multiple of <em>&lt;n&gt;</em>)
 558 in the log message before showing it in the output.
 559 <code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
 560 <code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
 561 which disables tab expansion.</p>
 562 <div class="paragraph">
 563 <p>By default, tabs are expanded in pretty formats that indent the log
 564 message by 4 spaces (i.e.  <em>medium</em>, which is the default, <em>full</em>,
 565 and <em>fuller</em>).</p>
 566 </div>
 567 </dd>
 568 <dt class="hdlist1">--notes[=&lt;ref&gt;]</dt>
 569 <dd>
 570 <p>Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
 571 commit, when showing the commit log message.  This is the default
 572 for <code>git log</code>, <code>git show</code> and <code>git whatchanged</code> commands when
 573 there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given
 574 on the command line.</p>
 575 <div class="paragraph">
 576 <p>By default, the notes shown are from the notes refs listed in the
 577 <code>core.notesRef</code> and <code>notes.displayRef</code> variables (or corresponding
 578 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p>
 579 </div>
 580 <div class="paragraph">
 581 <p>With an optional <em>&lt;ref&gt;</em> argument, use the ref to find the notes
 582 to display.  The ref can specify the full refname when it begins
 583 with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
 584 <code>refs/notes/</code> is prefixed to form the full name of the ref.</p>
 585 </div>
 586 <div class="paragraph">
 587 <p>Multiple --notes options can be combined to control which notes are
 588 being displayed. Examples: "--notes=foo" will show only notes from
 589 "refs/notes/foo"; "--notes=foo --notes" will show both notes from
 590 "refs/notes/foo" and from the default notes ref(s).</p>
 591 </div>
 592 </dd>
 593 <dt class="hdlist1">--no-notes</dt>
 594 <dd>
 595 <p>Do not show notes. This negates the above <code>--notes</code> option, by
 596 resetting the list of notes refs from which notes are shown.
 597 Options are parsed in the order given on the command line, so e.g.
 598 "--notes --notes=foo --no-notes --notes=bar" will only show notes
 599 from "refs/notes/bar".</p>
 600 </dd>
 601 <dt class="hdlist1">--show-notes-by-default</dt>
 602 <dd>
 603 <p>Show the default notes unless options for displaying specific
 604 notes are given.</p>
 605 </dd>
 606 <dt class="hdlist1">--show-notes[=&lt;ref&gt;]</dt>
 607 <dt class="hdlist1">--[no-]standard-notes</dt>
 608 <dd>
 609 <p>These options are deprecated. Use the above --notes/--no-notes
 610 options instead.</p>
 611 </dd>
 612 <dt class="hdlist1">--show-signature</dt>
 613 <dd>
 614 <p>Check the validity of a signed commit object by passing the signature
 615 to <code>gpg --verify</code> and show the output.</p>
 616 </dd>
 617 </dl>
 618 </div>
 619 </div>
 620 </div>
 621 <div class="sect1">
 622 <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 623 <div class="sectionbody">
 624 <div class="paragraph">
 625 <p>If the commit is a merge, and if the pretty-format
 626 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
 627 inserted before the <em>Author:</em> line.  This line begins with
 628 "Merge: " and the hashes of ancestral commits are printed,
 629 separated by spaces.  Note that the listed commits may not
 630 necessarily be the list of the <strong>direct</strong> parent commits if you
 631 have limited your view of history: for example, if you are
 632 only interested in changes related to a certain directory or
 633 file.</p>
 634 </div>
 635 <div class="paragraph">
 636 <p>There are several built-in formats, and you can define
 637 additional formats by setting a pretty.&lt;name&gt;
 638 config option to either another format name, or a
 639 <em>format:</em> string, as described below (see
 640 <a href="git-config.html">git-config(1)</a>). Here are the details of the
 641 built-in formats:</p>
 642 </div>
 643 <div class="ulist">
 644 <ul>
 645 <li>
 646 <p><em>oneline</em></p>
 647 <div class="literalblock">
 648 <div class="content">
 649 <pre>&lt;hash&gt; &lt;title-line&gt;</pre>
 650 </div>
 651 </div>
 652 <div class="paragraph">
 653 <p>This is designed to be as compact as possible.</p>
 654 </div>
 655 </li>
 656 <li>
 657 <p><em>short</em></p>
 658 <div class="literalblock">
 659 <div class="content">
 660 <pre>commit &lt;hash&gt;
 661 Author: &lt;author&gt;</pre>
 662 </div>
 663 </div>
 664 <div class="literalblock">
 665 <div class="content">
 666 <pre>&lt;title-line&gt;</pre>
 667 </div>
 668 </div>
 669 </li>
 670 <li>
 671 <p><em>medium</em></p>
 672 <div class="literalblock">
 673 <div class="content">
 674 <pre>commit &lt;hash&gt;
 675 Author: &lt;author&gt;
 676 Date:   &lt;author-date&gt;</pre>
 677 </div>
 678 </div>
 679 <div class="literalblock">
 680 <div class="content">
 681 <pre>&lt;title-line&gt;</pre>
 682 </div>
 683 </div>
 684 <div class="literalblock">
 685 <div class="content">
 686 <pre>&lt;full-commit-message&gt;</pre>
 687 </div>
 688 </div>
 689 </li>
 690 <li>
 691 <p><em>full</em></p>
 692 <div class="literalblock">
 693 <div class="content">
 694 <pre>commit &lt;hash&gt;
 695 Author: &lt;author&gt;
 696 Commit: &lt;committer&gt;</pre>
 697 </div>
 698 </div>
 699 <div class="literalblock">
 700 <div class="content">
 701 <pre>&lt;title-line&gt;</pre>
 702 </div>
 703 </div>
 704 <div class="literalblock">
 705 <div class="content">
 706 <pre>&lt;full-commit-message&gt;</pre>
 707 </div>
 708 </div>
 709 </li>
 710 <li>
 711 <p><em>fuller</em></p>
 712 <div class="literalblock">
 713 <div class="content">
 714 <pre>commit &lt;hash&gt;
 715 Author:     &lt;author&gt;
 716 AuthorDate: &lt;author-date&gt;
 717 Commit:     &lt;committer&gt;
 718 CommitDate: &lt;committer-date&gt;</pre>
 719 </div>
 720 </div>
 721 <div class="literalblock">
 722 <div class="content">
 723 <pre>&lt;title-line&gt;</pre>
 724 </div>
 725 </div>
 726 <div class="literalblock">
 727 <div class="content">
 728 <pre>&lt;full-commit-message&gt;</pre>
 729 </div>
 730 </div>
 731 </li>
 732 <li>
 733 <p><em>reference</em></p>
 734 <div class="literalblock">
 735 <div class="content">
 736 <pre>&lt;abbrev-hash&gt; (&lt;title-line&gt;, &lt;short-author-date&gt;)</pre>
 737 </div>
 738 </div>
 739 <div class="paragraph">
 740 <p>This format is used to refer to another commit in a commit message and
 741 is the same as <code>--pretty='format:%C(auto)%h (%s, %ad)'</code>.  By default,
 742 the date is formatted with <code>--date=short</code> unless another <code>--date</code> option
 743 is explicitly specified.  As with any <code>format:</code> with format
 744 placeholders, its output is not affected by other options like
 745 <code>--decorate</code> and <code>--walk-reflogs</code>.</p>
 746 </div>
 747 </li>
 748 <li>
 749 <p><em>email</em></p>
 750 <div class="literalblock">
 751 <div class="content">
 752 <pre>From &lt;hash&gt; &lt;date&gt;
 753 From: &lt;author&gt;
 754 Date: &lt;author-date&gt;
 755 Subject: [PATCH] &lt;title-line&gt;</pre>
 756 </div>
 757 </div>
 758 <div class="literalblock">
 759 <div class="content">
 760 <pre>&lt;full-commit-message&gt;</pre>
 761 </div>
 762 </div>
 763 </li>
 764 <li>
 765 <p><em>mboxrd</em></p>
 766 <div class="paragraph">
 767 <p>Like <em>email</em>, but lines in the commit message starting with "From "
 768 (preceded by zero or more "&gt;") are quoted with "&gt;" so they aren&#8217;t
 769 confused as starting a new commit.</p>
 770 </div>
 771 </li>
 772 <li>
 773 <p><em>raw</em></p>
 774 <div class="paragraph">
 775 <p>The <em>raw</em> format shows the entire commit exactly as
 776 stored in the commit object.  Notably, the hashes are
 777 displayed in full, regardless of whether --abbrev or
 778 --no-abbrev are used, and <em>parents</em> information show the
 779 true parent commits, without taking grafts or history
 780 simplification into account. Note that this format affects the way
 781 commits are displayed, but not the way the diff is shown e.g. with
 782 <code>git log --raw</code>. To get full object names in a raw diff format,
 783 use <code>--no-abbrev</code>.</p>
 784 </div>
 785 </li>
 786 <li>
 787 <p><em>format:&lt;format-string&gt;</em></p>
 788 <div class="paragraph">
 789 <p>The <em>format:&lt;format-string&gt;</em> format allows you to specify which information
 790 you want to show. It works a little bit like printf format,
 791 with the notable exception that you get a newline with <em>%n</em>
 792 instead of <em>\n</em>.</p>
 793 </div>
 794 <div class="paragraph">
 795 <p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was &gt;&gt;%s&lt;&lt;%n"</em>
 796 would show something like this:</p>
 797 </div>
 798 <div class="listingblock">
 799 <div class="content">
 800 <pre>The author of fe6e0ee was Junio C Hamano, 23 hours ago
 801 The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff input.&lt;&lt;</pre>
 802 </div>
 803 </div>
 804 <div class="paragraph">
 805 <p>The placeholders are:</p>
 806 </div>
 807 <div class="ulist">
 808 <ul>
 809 <li>
 810 <p>Placeholders that expand to a single literal character:</p>
 811 <div class="dlist">
 812 <dl>
 813 <dt class="hdlist1"><em>%n</em></dt>
 814 <dd>
 815 <p>newline</p>
 816 </dd>
 817 <dt class="hdlist1"><em>%%</em></dt>
 818 <dd>
 819 <p>a raw <em>%</em></p>
 820 </dd>
 821 <dt class="hdlist1"><em>%x00</em></dt>
 822 <dd>
 823 <p><em>%x</em> followed by two hexadecimal digits is replaced with a
 824 byte with the hexadecimal digits' value (we will call this
 825 "literal formatting code" in the rest of this document).</p>
 826 </dd>
 827 </dl>
 828 </div>
 829 </li>
 830 <li>
 831 <p>Placeholders that affect formatting of later placeholders:</p>
 832 <div class="dlist">
 833 <dl>
 834 <dt class="hdlist1"><em>%Cred</em></dt>
 835 <dd>
 836 <p>switch color to red</p>
 837 </dd>
 838 <dt class="hdlist1"><em>%Cgreen</em></dt>
 839 <dd>
 840 <p>switch color to green</p>
 841 </dd>
 842 <dt class="hdlist1"><em>%Cblue</em></dt>
 843 <dd>
 844 <p>switch color to blue</p>
 845 </dd>
 846 <dt class="hdlist1"><em>%Creset</em></dt>
 847 <dd>
 848 <p>reset color</p>
 849 </dd>
 850 <dt class="hdlist1"><em>%C(&#8230;&#8203;)</em></dt>
 851 <dd>
 852 <p>color specification, as described under Values in the
 853 "CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>.  By
 854 default, colors are shown only when enabled for log output
 855 (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting
 856 the <code>auto</code> settings of the former if we are going to a
 857 terminal). <code>%C(auto,...)</code> is accepted as a historical
 858 synonym for the default (e.g., <code>%C(auto,red)</code>). Specifying
 859 <code>%C(always,...)</code> will show the colors even when color is
 860 not otherwise enabled (though consider just using
 861 <code>--color=always</code> to enable color for the whole output,
 862 including this format and anything else git might color).
 863 <code>auto</code> alone (i.e. <code>%C(auto)</code>) will turn on auto coloring
 864 on the next placeholders until the color is switched
 865 again.</p>
 866 </dd>
 867 <dt class="hdlist1"><em>%m</em></dt>
 868 <dd>
 869 <p>left (<code>&lt;</code>), right (<code>&gt;</code>) or boundary (<code>-</code>) mark</p>
 870 </dd>
 871 <dt class="hdlist1"><em>%w([&lt;w&gt;[,&lt;i1&gt;[,&lt;i2&gt;]]])</em></dt>
 872 <dd>
 873 <p>switch line wrapping, like the -w option of
 874 <a href="git-shortlog.html">git-shortlog(1)</a>.</p>
 875 </dd>
 876 <dt class="hdlist1"><em>%&lt;( &lt;N&gt; [,trunc|ltrunc|mtrunc])</em></dt>
 877 <dd>
 878 <p>make the next placeholder take at
 879 least N column widths, padding spaces on
 880 the right if necessary.  Optionally
 881 truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>,
 882 the middle (mtrunc) <code>mi..le</code>, or the end
 883 (trunc) <code>rig..</code>, if the output is longer than
 884 N columns.
 885 Note 1: that truncating
 886 only works correctly with N &gt;= 2.
 887 Note 2: spaces around the N and M (see below)
 888 values are optional.
 889 Note 3: Emojis and other wide characters
 890 will take two display columns, which may
 891 over-run column boundaries.
 892 Note 4: decomposed character combining marks
 893 may be misplaced at padding boundaries.</p>
 894 </dd>
 895 <dt class="hdlist1"><em>%&lt;|( &lt;M&gt; )</em></dt>
 896 <dd>
 897 <p>make the next placeholder take at least until Mth
 898 display column, padding spaces on the right if necessary.
 899 Use negative M values for column positions measured
 900 from the right hand edge of the terminal window.</p>
 901 </dd>
 902 <dt class="hdlist1"><em>%&gt;( &lt;N&gt; )</em>, <em>%&gt;|( &lt;M&gt; )</em></dt>
 903 <dd>
 904 <p>similar to <em>%&lt;( &lt;N&gt; )</em>, <em>%&lt;|( &lt;M&gt; )</em> respectively,
 905 but padding spaces on the left</p>
 906 </dd>
 907 <dt class="hdlist1"><em>%&gt;&gt;( &lt;N&gt; )</em>, <em>%&gt;&gt;|( &lt;M&gt; )</em></dt>
 908 <dd>
 909 <p>similar to <em>%&gt;( &lt;N&gt; )</em>, <em>%&gt;|( &lt;M&gt; )</em>
 910 respectively, except that if the next
 911 placeholder takes more spaces than given and
 912 there are spaces on its left, use those
 913 spaces</p>
 914 </dd>
 915 <dt class="hdlist1"><em>%&gt;&lt;( &lt;N&gt; )</em>, <em>%&gt;&lt;|( &lt;M&gt; )</em></dt>
 916 <dd>
 917 <p>similar to <em>%&lt;( &lt;N&gt; )</em>, <em>%&lt;|( &lt;M&gt; )</em>
 918 respectively, but padding both sides
 919 (i.e. the text is centered)</p>
 920 </dd>
 921 </dl>
 922 </div>
 923 </li>
 924 <li>
 925 <p>Placeholders that expand to information extracted from the commit:</p>
 926 <div class="dlist">
 927 <dl>
 928 <dt class="hdlist1"><em>%H</em></dt>
 929 <dd>
 930 <p>commit hash</p>
 931 </dd>
 932 <dt class="hdlist1"><em>%h</em></dt>
 933 <dd>
 934 <p>abbreviated commit hash</p>
 935 </dd>
 936 <dt class="hdlist1"><em>%T</em></dt>
 937 <dd>
 938 <p>tree hash</p>
 939 </dd>
 940 <dt class="hdlist1"><em>%t</em></dt>
 941 <dd>
 942 <p>abbreviated tree hash</p>
 943 </dd>
 944 <dt class="hdlist1"><em>%P</em></dt>
 945 <dd>
 946 <p>parent hashes</p>
 947 </dd>
 948 <dt class="hdlist1"><em>%p</em></dt>
 949 <dd>
 950 <p>abbreviated parent hashes</p>
 951 </dd>
 952 <dt class="hdlist1"><em>%an</em></dt>
 953 <dd>
 954 <p>author name</p>
 955 </dd>
 956 <dt class="hdlist1"><em>%aN</em></dt>
 957 <dd>
 958 <p>author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
 959 or <a href="git-blame.html">git-blame(1)</a>)</p>
 960 </dd>
 961 <dt class="hdlist1"><em>%ae</em></dt>
 962 <dd>
 963 <p>author email</p>
 964 </dd>
 965 <dt class="hdlist1"><em>%aE</em></dt>
 966 <dd>
 967 <p>author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
 968 or <a href="git-blame.html">git-blame(1)</a>)</p>
 969 </dd>
 970 <dt class="hdlist1"><em>%al</em></dt>
 971 <dd>
 972 <p>author email local-part (the part before the <em>@</em> sign)</p>
 973 </dd>
 974 <dt class="hdlist1"><em>%aL</em></dt>
 975 <dd>
 976 <p>author local-part (see <em>%al</em>) respecting .mailmap, see
 977 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
 978 </dd>
 979 <dt class="hdlist1"><em>%ad</em></dt>
 980 <dd>
 981 <p>author date (format respects --date= option)</p>
 982 </dd>
 983 <dt class="hdlist1"><em>%aD</em></dt>
 984 <dd>
 985 <p>author date, RFC2822 style</p>
 986 </dd>
 987 <dt class="hdlist1"><em>%ar</em></dt>
 988 <dd>
 989 <p>author date, relative</p>
 990 </dd>
 991 <dt class="hdlist1"><em>%at</em></dt>
 992 <dd>
 993 <p>author date, UNIX timestamp</p>
 994 </dd>
 995 <dt class="hdlist1"><em>%ai</em></dt>
 996 <dd>
 997 <p>author date, ISO 8601-like format</p>
 998 </dd>
 999 <dt class="hdlist1"><em>%aI</em></dt>
1000 <dd>
1001 <p>author date, strict ISO 8601 format</p>
1002 </dd>
1003 <dt class="hdlist1"><em>%as</em></dt>
1004 <dd>
1005 <p>author date, short format (<code>YYYY-MM-DD</code>)</p>
1006 </dd>
1007 <dt class="hdlist1"><em>%ah</em></dt>
1008 <dd>
1009 <p>author date, human style (like the <code>--date=human</code> option of
1010 <a href="git-rev-list.html">git-rev-list(1)</a>)</p>
1011 </dd>
1012 <dt class="hdlist1"><em>%cn</em></dt>
1013 <dd>
1014 <p>committer name</p>
1015 </dd>
1016 <dt class="hdlist1"><em>%cN</em></dt>
1017 <dd>
1018 <p>committer name (respecting .mailmap, see
1019 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
1020 </dd>
1021 <dt class="hdlist1"><em>%ce</em></dt>
1022 <dd>
1023 <p>committer email</p>
1024 </dd>
1025 <dt class="hdlist1"><em>%cE</em></dt>
1026 <dd>
1027 <p>committer email (respecting .mailmap, see
1028 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
1029 </dd>
1030 <dt class="hdlist1"><em>%cl</em></dt>
1031 <dd>
1032 <p>committer email local-part (the part before the <em>@</em> sign)</p>
1033 </dd>
1034 <dt class="hdlist1"><em>%cL</em></dt>
1035 <dd>
1036 <p>committer local-part (see <em>%cl</em>) respecting .mailmap, see
1037 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
1038 </dd>
1039 <dt class="hdlist1"><em>%cd</em></dt>
1040 <dd>
1041 <p>committer date (format respects --date= option)</p>
1042 </dd>
1043 <dt class="hdlist1"><em>%cD</em></dt>
1044 <dd>
1045 <p>committer date, RFC2822 style</p>
1046 </dd>
1047 <dt class="hdlist1"><em>%cr</em></dt>
1048 <dd>
1049 <p>committer date, relative</p>
1050 </dd>
1051 <dt class="hdlist1"><em>%ct</em></dt>
1052 <dd>
1053 <p>committer date, UNIX timestamp</p>
1054 </dd>
1055 <dt class="hdlist1"><em>%ci</em></dt>
1056 <dd>
1057 <p>committer date, ISO 8601-like format</p>
1058 </dd>
1059 <dt class="hdlist1"><em>%cI</em></dt>
1060 <dd>
1061 <p>committer date, strict ISO 8601 format</p>
1062 </dd>
1063 <dt class="hdlist1"><em>%cs</em></dt>
1064 <dd>
1065 <p>committer date, short format (<code>YYYY-MM-DD</code>)</p>
1066 </dd>
1067 <dt class="hdlist1"><em>%ch</em></dt>
1068 <dd>
1069 <p>committer date, human style (like the <code>--date=human</code> option of
1070 <a href="git-rev-list.html">git-rev-list(1)</a>)</p>
1071 </dd>
1072 <dt class="hdlist1"><em>%d</em></dt>
1073 <dd>
1074 <p>ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a></p>
1075 </dd>
1076 <dt class="hdlist1"><em>%D</em></dt>
1077 <dd>
1078 <p>ref names without the " (", ")" wrapping.</p>
1079 </dd>
1080 <dt class="hdlist1"><em>%(decorate[:&lt;options&gt;])</em></dt>
1081 <dd>
1082 <p>ref names with custom decorations. The <code>decorate</code> string may be followed by a
1083 colon and zero or more comma-separated options. Option values may contain
1084 literal formatting codes. These must be used for commas (<code>%x2C</code>) and closing
1085 parentheses (<code>%x29</code>), due to their role in the option syntax.</p>
1086 <div class="ulist">
1087 <ul>
1088 <li>
1089 <p><em>prefix=&lt;value&gt;</em>: Shown before the list of ref names.  Defaults to "&#160;<code>(</code>".</p>
1090 </li>
1091 <li>
1092 <p><em>suffix=&lt;value&gt;</em>: Shown after the list of ref names.  Defaults to "<code>)</code>".</p>
1093 </li>
1094 <li>
1095 <p><em>separator=&lt;value&gt;</em>: Shown between ref names.  Defaults to "<code>,</code>&#160;".</p>
1096 </li>
1097 <li>
1098 <p><em>pointer=&lt;value&gt;</em>: Shown between HEAD and the branch it points to, if any.
1099 Defaults to "&#160;<code>-&gt;</code>&#160;".</p>
1100 </li>
1101 <li>
1102 <p><em>tag=&lt;value&gt;</em>: Shown before tag names. Defaults to "<code>tag:</code>&#160;".</p>
1103 </li>
1104 </ul>
1105 </div>
1106 </dd>
1107 </dl>
1108 </div>
1109 </li>
1110 </ul>
1111 </div>
1112 <div class="paragraph">
1113 <p>For example, to produce decorations with no wrapping
1114 or tag annotations, and spaces as separators:</p>
1115 </div>
1116 <div class="paragraph">
1117 <p>+
1118 <code>%(decorate:prefix=,suffix=,tag=,separator= )</code></p>
1119 </div>
1120 <div class="dlist">
1121 <dl>
1122 <dt class="hdlist1"><em>%(describe[:&lt;options&gt;])</em></dt>
1123 <dd>
1124 <p>human-readable name, like <a href="git-describe.html">git-describe(1)</a>; empty string for
1125 undescribable commits.  The <code>describe</code> string may be followed by a colon and
1126 zero or more comma-separated options.  Descriptions can be inconsistent when
1127 tags are added or removed at the same time.</p>
1128 <div class="ulist">
1129 <ul>
1130 <li>
1131 <p><em>tags[=&lt;bool-value&gt;]</em>: Instead of only considering annotated tags,
1132 consider lightweight tags as well.</p>
1133 </li>
1134 <li>
1135 <p><em>abbrev=&lt;number&gt;</em>: Instead of using the default number of hexadecimal digits
1136 (which will vary according to the number of objects in the repository with a
1137 default of 7) of the abbreviated object name, use &lt;number&gt; digits, or as many
1138 digits as needed to form a unique object name.</p>
1139 </li>
1140 <li>
1141 <p><em>match=&lt;pattern&gt;</em>: Only consider tags matching the given
1142 <code>glob(7)</code> pattern, excluding the "refs/tags/" prefix.</p>
1143 </li>
1144 <li>
1145 <p><em>exclude=&lt;pattern&gt;</em>: Do not consider tags matching the given
1146 <code>glob(7)</code> pattern, excluding the "refs/tags/" prefix.</p>
1147 </li>
1148 </ul>
1149 </div>
1150 </dd>
1151 <dt class="hdlist1"><em>%S</em></dt>
1152 <dd>
1153 <p>ref name given on the command line by which the commit was reached
1154 (like <code>git log --source</code>), only works with <code>git log</code></p>
1155 </dd>
1156 <dt class="hdlist1"><em>%e</em></dt>
1157 <dd>
1158 <p>encoding</p>
1159 </dd>
1160 <dt class="hdlist1"><em>%s</em></dt>
1161 <dd>
1162 <p>subject</p>
1163 </dd>
1164 <dt class="hdlist1"><em>%f</em></dt>
1165 <dd>
1166 <p>sanitized subject line, suitable for a filename</p>
1167 </dd>
1168 <dt class="hdlist1"><em>%b</em></dt>
1169 <dd>
1170 <p>body</p>
1171 </dd>
1172 <dt class="hdlist1"><em>%B</em></dt>
1173 <dd>
1174 <p>raw body (unwrapped subject and body)</p>
1175 </dd>
1176 <dt class="hdlist1"><em>%N</em></dt>
1177 <dd>
1178 <p>commit notes</p>
1179 </dd>
1180 <dt class="hdlist1"><em>%GG</em></dt>
1181 <dd>
1182 <p>raw verification message from GPG for a signed commit</p>
1183 </dd>
1184 <dt class="hdlist1"><em>%G?</em></dt>
1185 <dd>
1186 <p>show "G" for a good (valid) signature,
1187 "B" for a bad signature,
1188 "U" for a good signature with unknown validity,
1189 "X" for a good signature that has expired,
1190 "Y" for a good signature made by an expired key,
1191 "R" for a good signature made by a revoked key,
1192 "E" if the signature cannot be checked (e.g. missing key)
1193 and "N" for no signature</p>
1194 </dd>
1195 <dt class="hdlist1"><em>%GS</em></dt>
1196 <dd>
1197 <p>show the name of the signer for a signed commit</p>
1198 </dd>
1199 <dt class="hdlist1"><em>%GK</em></dt>
1200 <dd>
1201 <p>show the key used to sign a signed commit</p>
1202 </dd>
1203 <dt class="hdlist1"><em>%GF</em></dt>
1204 <dd>
1205 <p>show the fingerprint of the key used to sign a signed commit</p>
1206 </dd>
1207 <dt class="hdlist1"><em>%GP</em></dt>
1208 <dd>
1209 <p>show the fingerprint of the primary key whose subkey was used
1210 to sign a signed commit</p>
1211 </dd>
1212 <dt class="hdlist1"><em>%GT</em></dt>
1213 <dd>
1214 <p>show the trust level for the key used to sign a signed commit</p>
1215 </dd>
1216 <dt class="hdlist1"><em>%gD</em></dt>
1217 <dd>
1218 <p>reflog selector, e.g., <code>refs/stash@{1}</code> or <code>refs/stash@{2
1219 minutes ago}</code>; the format follows the rules described for the
1220 <code>-g</code> option. The portion before the <code>@</code> is the refname as
1221 given on the command line (so <code>git log -g refs/heads/master</code>
1222 would yield <code>refs/heads/master@{0}</code>).</p>
1223 </dd>
1224 <dt class="hdlist1"><em>%gd</em></dt>
1225 <dd>
1226 <p>shortened reflog selector; same as <code>%gD</code>, but the refname
1227 portion is shortened for human readability (so
1228 <code>refs/heads/master</code> becomes just <code>master</code>).</p>
1229 </dd>
1230 <dt class="hdlist1"><em>%gn</em></dt>
1231 <dd>
1232 <p>reflog identity name</p>
1233 </dd>
1234 <dt class="hdlist1"><em>%gN</em></dt>
1235 <dd>
1236 <p>reflog identity name (respecting .mailmap, see
1237 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
1238 </dd>
1239 <dt class="hdlist1"><em>%ge</em></dt>
1240 <dd>
1241 <p>reflog identity email</p>
1242 </dd>
1243 <dt class="hdlist1"><em>%gE</em></dt>
1244 <dd>
1245 <p>reflog identity email (respecting .mailmap, see
1246 <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)</p>
1247 </dd>
1248 <dt class="hdlist1"><em>%gs</em></dt>
1249 <dd>
1250 <p>reflog subject</p>
1251 </dd>
1252 <dt class="hdlist1"><em>%(trailers[:&lt;options&gt;])</em></dt>
1253 <dd>
1254 <p>display the trailers of the body as interpreted by
1255 <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
1256 a colon and zero or more comma-separated options. If any option is provided
1257 multiple times, the last occurrence wins.</p>
1258 <div class="ulist">
1259 <ul>
1260 <li>
1261 <p><em>key=&lt;key&gt;</em>: only show trailers with specified &lt;key&gt;. Matching is done
1262 case-insensitively and trailing colon is optional. If option is
1263 given multiple times trailer lines matching any of the keys are
1264 shown. This option automatically enables the <code>only</code> option so that
1265 non-trailer lines in the trailer block are hidden. If that is not
1266 desired it can be disabled with <code>only=false</code>.  E.g.,
1267 <code>%(trailers:key=Reviewed-by)</code> shows trailer lines with key
1268 <code>Reviewed-by</code>.</p>
1269 </li>
1270 <li>
1271 <p><em>only[=&lt;bool&gt;]</em>: select whether non-trailer lines from the trailer
1272 block should be included.</p>
1273 </li>
1274 <li>
1275 <p><em>separator=&lt;sep&gt;</em>: specify the separator inserted between trailer
1276 lines. Defaults to a line feed character. The string &lt;sep&gt; may contain
1277 the literal formatting codes described above. To use comma as
1278 separator one must use <code>%x2C</code> as it would otherwise be parsed as
1279 next option. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code>
1280 shows all trailer lines whose key is "Ticket" separated by a comma
1281 and a space.</p>
1282 </li>
1283 <li>
1284 <p><em>unfold[=&lt;bool&gt;]</em>: make it behave as if interpret-trailer&#8217;s <code>--unfold</code>
1285 option was given. E.g.,
1286 <code>%(trailers:only,unfold=true)</code> unfolds and shows all trailer lines.</p>
1287 </li>
1288 <li>
1289 <p><em>keyonly[=&lt;bool&gt;]</em>: only show the key part of the trailer.</p>
1290 </li>
1291 <li>
1292 <p><em>valueonly[=&lt;bool&gt;]</em>: only show the value part of the trailer.</p>
1293 </li>
1294 <li>
1295 <p><em>key_value_separator=&lt;sep&gt;</em>: specify the separator inserted between
1296 the key and value of each trailer. Defaults to ": ". Otherwise it
1297 shares the same semantics as <em>separator=&lt;sep&gt;</em> above.</p>
1298 </li>
1299 </ul>
1300 </div>
1301 </dd>
1302 </dl>
1303 </div>
1304 </li>
1305 </ul>
1306 </div>
1307 <div class="admonitionblock note">
1308 <table>
1309 <tr>
1310 <td class="icon">
1311 <div class="title">Note</div>
1312 </td>
1313 <td class="content">
1314 Some placeholders may depend on other options given to the
1315 revision traversal engine. For example, the <code>%g*</code> reflog options will
1316 insert an empty string unless we are traversing reflog entries (e.g., by
1317 <code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
1318 decoration format if <code>--decorate</code> was not already provided on the command
1319 line.
1320 </td>
1321 </tr>
1322 </table>
1323 </div>
1324 <div class="paragraph">
1325 <p>The boolean options accept an optional value <code>[=&lt;bool-value&gt;]</code>. The values
1326 <code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
1327 sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean
1328 option is given with no value, it&#8217;s enabled.</p>
1329 </div>
1330 <div class="paragraph">
1331 <p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
1332 is inserted immediately before the expansion if and only if the
1333 placeholder expands to a non-empty string.</p>
1334 </div>
1335 <div class="paragraph">
1336 <p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
1337 line-feeds immediately preceding the expansion are deleted if and only if the
1338 placeholder expands to an empty string.</p>
1339 </div>
1340 <div class="paragraph">
1341 <p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
1342 is inserted immediately before the expansion if and only if the
1343 placeholder expands to a non-empty string.</p>
1344 </div>
1345 <div class="ulist">
1346 <ul>
1347 <li>
1348 <p><em>tformat:</em></p>
1349 <div class="paragraph">
1350 <p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1351 provides "terminator" semantics instead of "separator" semantics. In
1352 other words, each commit has the message terminator character (usually a
1353 newline) appended, rather than a separator placed between entries.
1354 This means that the final entry of a single-line format will be properly
1355 terminated with a new line, just as the "oneline" format does.
1356 For example:</p>
1357 </div>
1358 <div class="listingblock">
1359 <div class="content">
1360 <pre>$ git log -2 --pretty=format:%h 4da45bef \
1361   | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1362 4da45be
1363 7134973 -- NO NEWLINE
1364
1365 $ git log -2 --pretty=tformat:%h 4da45bef \
1366   | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1367 4da45be
1368 7134973</pre>
1369 </div>
1370 </div>
1371 <div class="paragraph">
1372 <p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
1373 as if it has <code>tformat:</code> in front of it.  For example, these two are
1374 equivalent:</p>
1375 </div>
1376 <div class="listingblock">
1377 <div class="content">
1378 <pre>$ git log -2 --pretty=tformat:%h 4da45bef
1379 $ git log -2 --pretty=%h 4da45bef</pre>
1380 </div>
1381 </div>
1382 </li>
1383 </ul>
1384 </div>
1385 </div>
1386 </div>
1387 <div class="sect1">
1388 <h2 id="_diff_formatting">DIFF FORMATTING</h2>
1389 <div class="sectionbody">
1390 <div class="paragraph">
1391 <p>The options below can be used to change the way <code>git show</code> generates
1392 diff output.</p>
1393 </div>
1394 <div class="dlist">
1395 <dl>
1396 <dt class="hdlist1">-p</dt>
1397 <dt class="hdlist1">-u</dt>
1398 <dt class="hdlist1">--patch</dt>
1399 <dd>
1400 <p>Generate patch (see <a href="#generate_patch_text_with_p">Generating patch text with -p</a>).</p>
1401 </dd>
1402 <dt class="hdlist1">-s</dt>
1403 <dt class="hdlist1">--no-patch</dt>
1404 <dd>
1405 <p>Suppress all output from the diff machinery.  Useful for
1406 commands like <code>git show</code> that show the patch by default to
1407 squelch their output, or to cancel the effect of options like
1408 <code>--patch</code>, <code>--stat</code> earlier on the command line in an alias.</p>
1409 </dd>
1410 <dt class="hdlist1">-m</dt>
1411 <dd>
1412 <p>Show diffs for merge commits in the default format. This is
1413 similar to <em>--diff-merges=on</em>, except <code>-m</code> will
1414 produce no output unless <code>-p</code> is given as well.</p>
1415 </dd>
1416 <dt class="hdlist1">-c</dt>
1417 <dd>
1418 <p>Produce combined diff output for merge commits.
1419 Shortcut for <em>--diff-merges=combined -p</em>.</p>
1420 </dd>
1421 <dt class="hdlist1">--cc</dt>
1422 <dd>
1423 <p>Produce dense combined diff output for merge commits.
1424 Shortcut for <em>--diff-merges=dense-combined -p</em>.</p>
1425 </dd>
1426 <dt class="hdlist1">--dd</dt>
1427 <dd>
1428 <p>Produce diff with respect to first parent for both merge and
1429 regular commits.
1430 Shortcut for <em>--diff-merges=first-parent -p</em>.</p>
1431 </dd>
1432 <dt class="hdlist1">--remerge-diff</dt>
1433 <dd>
1434 <p>Produce remerge-diff output for merge commits.
1435 Shortcut for <em>--diff-merges=remerge -p</em>.</p>
1436 </dd>
1437 <dt class="hdlist1">--no-diff-merges</dt>
1438 <dd>
1439 <p>Synonym for <em>--diff-merges=off</em>.</p>
1440 </dd>
1441 <dt class="hdlist1">--diff-merges=&lt;format&gt;</dt>
1442 <dd>
1443 <p>Specify diff format to be used for merge commits. Default is
1444 `dense-combined` unless <code>--first-parent</code> is in use, in
1445 which case <code>first-parent</code> is the default.</p>
1446 <div class="paragraph">
1447 <p>The following formats are supported:</p>
1448 </div>
1449 <div class="openblock">
1450 <div class="content">
1451 <div class="dlist">
1452 <dl>
1453 <dt class="hdlist1">off, none</dt>
1454 <dd>
1455 <p>Disable output of diffs for merge commits. Useful to override
1456 implied value.</p>
1457 </dd>
1458 <dt class="hdlist1">on, m</dt>
1459 <dd>
1460 <p>Make diff output for merge commits to be shown in the default
1461 format. The default format can be changed using
1462 <code>log.diffMerges</code> configuration variable, whose default value
1463 is <code>separate</code>.</p>
1464 </dd>
1465 <dt class="hdlist1">first-parent, 1</dt>
1466 <dd>
1467 <p>Show full diff with respect to first parent. This is the same
1468 format as <code>--patch</code> produces for non-merge commits.</p>
1469 </dd>
1470 <dt class="hdlist1">separate</dt>
1471 <dd>
1472 <p>Show full diff with respect to each of parents.
1473 Separate log entry and diff is generated for each parent.</p>
1474 </dd>
1475 <dt class="hdlist1">combined, c</dt>
1476 <dd>
1477 <p>Show differences from each of the parents to the merge
1478 result simultaneously instead of showing pairwise diff between
1479 a parent and the result one at a time. Furthermore, it lists
1480 only files which were modified from all parents.</p>
1481 </dd>
1482 <dt class="hdlist1">dense-combined, cc</dt>
1483 <dd>
1484 <p>Further compress output produced by <code>--diff-merges=combined</code>
1485 by omitting uninteresting hunks whose contents in the parents
1486 have only two variants and the merge result picks one of them
1487 without modification.</p>
1488 </dd>
1489 <dt class="hdlist1">remerge, r</dt>
1490 <dd>
1491 <p>Remerge two-parent merge commits to create a temporary tree
1492 object&#8212;&#8203;potentially containing files with conflict markers
1493 and such.  A diff is then shown between that temporary tree
1494 and the actual merge commit.</p>
1495 <div class="paragraph">
1496 <p>The output emitted when this option is used is subject to change, and
1497 so is its interaction with other options (unless explicitly
1498 documented).</p>
1499 </div>
1500 </dd>
1501 </dl>
1502 </div>
1503 </div>
1504 </div>
1505 </dd>
1506 <dt class="hdlist1">--combined-all-paths</dt>
1507 <dd>
1508 <p>This flag causes combined diffs (used for merge commits) to
1509 list the name of the file from all parents.  It thus only has
1510 effect when <code>--diff-merges=[dense-]combined</code> is in use, and
1511 is likely only useful if filename changes are detected (i.e.
1512 when either rename or copy detection have been requested).</p>
1513 </dd>
1514 <dt class="hdlist1">-U&lt;n&gt;</dt>
1515 <dt class="hdlist1">--unified=&lt;n&gt;</dt>
1516 <dd>
1517 <p>Generate diffs with &lt;n&gt; lines of context instead of
1518 the usual three.
1519 Implies <code>--patch</code>.</p>
1520 </dd>
1521 <dt class="hdlist1">--output=&lt;file&gt;</dt>
1522 <dd>
1523 <p>Output to a specific file instead of stdout.</p>
1524 </dd>
1525 <dt class="hdlist1">--output-indicator-new=&lt;char&gt;</dt>
1526 <dt class="hdlist1">--output-indicator-old=&lt;char&gt;</dt>
1527 <dt class="hdlist1">--output-indicator-context=&lt;char&gt;</dt>
1528 <dd>
1529 <p>Specify the character used to indicate new, old or context
1530 lines in the generated patch. Normally they are <em>+</em>, <em>-</em> and
1531 ' ' respectively.</p>
1532 </dd>
1533 <dt class="hdlist1">--raw</dt>
1534 <dd>
1535 <p>For each commit, show a summary of changes using the raw diff
1536 format. See the "RAW OUTPUT FORMAT" section of
1537 <a href="git-diff.html">git-diff(1)</a>. This is different from showing the log
1538 itself in raw format, which you can achieve with
1539 <code>--format=raw</code>.</p>
1540 </dd>
1541 <dt class="hdlist1">--patch-with-raw</dt>
1542 <dd>
1543 <p>Synonym for <code>-p --raw</code>.</p>
1544 </dd>
1545 <dt class="hdlist1">-t</dt>
1546 <dd>
1547 <p>Show the tree objects in the diff output.</p>
1548 </dd>
1549 <dt class="hdlist1">--indent-heuristic</dt>
1550 <dd>
1551 <p>Enable the heuristic that shifts diff hunk boundaries to make patches
1552 easier to read. This is the default.</p>
1553 </dd>
1554 <dt class="hdlist1">--no-indent-heuristic</dt>
1555 <dd>
1556 <p>Disable the indent heuristic.</p>
1557 </dd>
1558 <dt class="hdlist1">--minimal</dt>
1559 <dd>
1560 <p>Spend extra time to make sure the smallest possible
1561 diff is produced.</p>
1562 </dd>
1563 <dt class="hdlist1">--patience</dt>
1564 <dd>
1565 <p>Generate a diff using the "patience diff" algorithm.</p>
1566 </dd>
1567 <dt class="hdlist1">--histogram</dt>
1568 <dd>
1569 <p>Generate a diff using the "histogram diff" algorithm.</p>
1570 </dd>
1571 <dt class="hdlist1">--anchored=&lt;text&gt;</dt>
1572 <dd>
1573 <p>Generate a diff using the "anchored diff" algorithm.</p>
1574 <div class="paragraph">
1575 <p>This option may be specified more than once.</p>
1576 </div>
1577 <div class="paragraph">
1578 <p>If a line exists in both the source and destination, exists only once,
1579 and starts with this text, this algorithm attempts to prevent it from
1580 appearing as a deletion or addition in the output. It uses the "patience
1581 diff" algorithm internally.</p>
1582 </div>
1583 </dd>
1584 <dt class="hdlist1">--diff-algorithm={patience|minimal|histogram|myers}</dt>
1585 <dd>
1586 <p>Choose a diff algorithm. The variants are as follows:</p>
1587 <div class="openblock">
1588 <div class="content">
1589 <div class="dlist">
1590 <dl>
1591 <dt class="hdlist1"><code>default</code>, <code>myers</code></dt>
1592 <dd>
1593 <p>The basic greedy diff algorithm. Currently, this is the default.</p>
1594 </dd>
1595 <dt class="hdlist1"><code>minimal</code></dt>
1596 <dd>
1597 <p>Spend extra time to make sure the smallest possible diff is
1598 produced.</p>
1599 </dd>
1600 <dt class="hdlist1"><code>patience</code></dt>
1601 <dd>
1602 <p>Use "patience diff" algorithm when generating patches.</p>
1603 </dd>
1604 <dt class="hdlist1"><code>histogram</code></dt>
1605 <dd>
1606 <p>This algorithm extends the patience algorithm to "support
1607 low-occurrence common elements".</p>
1608 </dd>
1609 </dl>
1610 </div>
1611 </div>
1612 </div>
1613 <div class="paragraph">
1614 <p>For instance, if you configured the <code>diff.algorithm</code> variable to a
1615 non-default value and want to use the default one, then you
1616 have to use <code>--diff-algorithm=default</code> option.</p>
1617 </div>
1618 </dd>
1619 <dt class="hdlist1">--stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]</dt>
1620 <dd>
1621 <p>Generate a diffstat. By default, as much space as necessary
1622 will be used for the filename part, and the rest for the graph
1623 part. Maximum width defaults to terminal width, or 80 columns
1624 if not connected to a terminal, and can be overridden by
1625 <code>&lt;width&gt;</code>. The width of the filename part can be limited by
1626 giving another width <code>&lt;name-width&gt;</code> after a comma or by setting
1627 <code>diff.statNameWidth=&lt;width&gt;</code>. The width of the graph part can be
1628 limited by using <code>--stat-graph-width=&lt;width&gt;</code> or by setting
1629 <code>diff.statGraphWidth=&lt;width&gt;</code>. Using <code>--stat</code> or
1630 <code>--stat-graph-width</code> affects all commands generating a stat graph,
1631 while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
1632 does not affect <code>git format-patch</code>.
1633 By giving a third parameter <code>&lt;count&gt;</code>, you can limit the output to
1634 the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if there are more.</p>
1635 <div class="paragraph">
1636 <p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
1637 <code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p>
1638 </div>
1639 </dd>
1640 <dt class="hdlist1">--compact-summary</dt>
1641 <dd>
1642 <p>Output a condensed summary of extended header information such
1643 as file creations or deletions ("new" or "gone", optionally "+l"
1644 if it&#8217;s a symlink) and mode changes ("+x" or "-x" for adding
1645 or removing executable bit respectively) in diffstat. The
1646 information is put between the filename part and the graph
1647 part. Implies <code>--stat</code>.</p>
1648 </dd>
1649 <dt class="hdlist1">--numstat</dt>
1650 <dd>
1651 <p>Similar to <code>--stat</code>, but shows number of added and
1652 deleted lines in decimal notation and pathname without
1653 abbreviation, to make it more machine friendly.  For
1654 binary files, outputs two <code>-</code> instead of saying
1655 <code>0 0</code>.</p>
1656 </dd>
1657 <dt class="hdlist1">--shortstat</dt>
1658 <dd>
1659 <p>Output only the last line of the <code>--stat</code> format containing total
1660 number of modified files, as well as number of added and deleted
1661 lines.</p>
1662 </dd>
1663 <dt class="hdlist1">-X[&lt;param1,param2,&#8230;&#8203;&gt;]</dt>
1664 <dt class="hdlist1">--dirstat[=&lt;param1,param2,&#8230;&#8203;&gt;]</dt>
1665 <dd>
1666 <p>Output the distribution of relative amount of changes for each
1667 sub-directory. The behavior of <code>--dirstat</code> can be customized by
1668 passing it a comma separated list of parameters.
1669 The defaults are controlled by the <code>diff.dirstat</code> configuration
1670 variable (see <a href="git-config.html">git-config(1)</a>).
1671 The following parameters are available:</p>
1672 <div class="openblock">
1673 <div class="content">
1674 <div class="dlist">
1675 <dl>
1676 <dt class="hdlist1"><code>changes</code></dt>
1677 <dd>
1678 <p>Compute the dirstat numbers by counting the lines that have been
1679 removed from the source, or added to the destination. This ignores
1680 the amount of pure code movements within a file.  In other words,
1681 rearranging lines in a file is not counted as much as other changes.
1682 This is the default behavior when no parameter is given.</p>
1683 </dd>
1684 <dt class="hdlist1"><code>lines</code></dt>
1685 <dd>
1686 <p>Compute the dirstat numbers by doing the regular line-based diff
1687 analysis, and summing the removed/added line counts. (For binary
1688 files, count 64-byte chunks instead, since binary files have no
1689 natural concept of lines). This is a more expensive <code>--dirstat</code>
1690 behavior than the <code>changes</code> behavior, but it does count rearranged
1691 lines within a file as much as other changes. The resulting output
1692 is consistent with what you get from the other <code>--*stat</code> options.</p>
1693 </dd>
1694 <dt class="hdlist1"><code>files</code></dt>
1695 <dd>
1696 <p>Compute the dirstat numbers by counting the number of files changed.
1697 Each changed file counts equally in the dirstat analysis. This is
1698 the computationally cheapest <code>--dirstat</code> behavior, since it does
1699 not have to look at the file contents at all.</p>
1700 </dd>
1701 <dt class="hdlist1"><code>cumulative</code></dt>
1702 <dd>
1703 <p>Count changes in a child directory for the parent directory as well.
1704 Note that when using <code>cumulative</code>, the sum of the percentages
1705 reported may exceed 100%. The default (non-cumulative) behavior can
1706 be specified with the <code>noncumulative</code> parameter.</p>
1707 </dd>
1708 <dt class="hdlist1">&lt;limit&gt;</dt>
1709 <dd>
1710 <p>An integer parameter specifies a cut-off percent (3% by default).
1711 Directories contributing less than this percentage of the changes
1712 are not shown in the output.</p>
1713 </dd>
1714 </dl>
1715 </div>
1716 </div>
1717 </div>
1718 <div class="paragraph">
1719 <p>Example: The following will count changed files, while ignoring
1720 directories with less than 10% of the total amount of changed files,
1721 and accumulating child directory counts in the parent directories:
1722 <code>--dirstat=files,10,cumulative</code>.</p>
1723 </div>
1724 </dd>
1725 <dt class="hdlist1">--cumulative</dt>
1726 <dd>
1727 <p>Synonym for --dirstat=cumulative</p>
1728 </dd>
1729 <dt class="hdlist1">--dirstat-by-file[=&lt;param1,param2&gt;&#8230;&#8203;]</dt>
1730 <dd>
1731 <p>Synonym for --dirstat=files,&lt;param1&gt;,&lt;param2&gt;&#8230;&#8203;</p>
1732 </dd>
1733 <dt class="hdlist1">--summary</dt>
1734 <dd>
1735 <p>Output a condensed summary of extended header information
1736 such as creations, renames and mode changes.</p>
1737 </dd>
1738 <dt class="hdlist1">--patch-with-stat</dt>
1739 <dd>
1740 <p>Synonym for <code>-p --stat</code>.</p>
1741 </dd>
1742 <dt class="hdlist1">-z</dt>
1743 <dd>
1744 <p>Separate the commits with NULs instead of newlines.</p>
1745 <div class="paragraph">
1746 <p>Also, when <code>--raw</code> or <code>--numstat</code> has been given, do not munge
1747 pathnames and use NULs as output field terminators.</p>
1748 </div>
1749 <div class="paragraph">
1750 <p>Without this option, pathnames with "unusual" characters are quoted as
1751 explained for the configuration variable <code>core.quotePath</code> (see
1752 <a href="git-config.html">git-config(1)</a>).</p>
1753 </div>
1754 </dd>
1755 <dt class="hdlist1">--name-only</dt>
1756 <dd>
1757 <p>Show only the name of each changed file in the post-image tree.
1758 The file names are often encoded in UTF-8.
1759 For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1760 manual page.</p>
1761 </dd>
1762 <dt class="hdlist1">--name-status</dt>
1763 <dd>
1764 <p>Show only the name(s) and status of each changed file. See the description
1765 of the <code>--diff-filter</code> option on what the status letters mean.
1766 Just like <code>--name-only</code> the file names are often encoded in UTF-8.</p>
1767 </dd>
1768 <dt class="hdlist1">--submodule[=&lt;format&gt;]</dt>
1769 <dd>
1770 <p>Specify how differences in submodules are shown.  When specifying
1771 <code>--submodule=short</code> the <em>short</em> format is used.  This format just
1772 shows the names of the commits at the beginning and end of the range.
1773 When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em>
1774 format is used.  This format lists the commits in the range like
1775 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does.  When <code>--submodule=diff</code>
1776 is specified, the <em>diff</em> format is used.  This format shows an
1777 inline diff of the changes in the submodule contents between the
1778 commit range.  Defaults to <code>diff.submodule</code> or the <em>short</em> format
1779 if the config option is unset.</p>
1780 </dd>
1781 <dt class="hdlist1">--color[=&lt;when&gt;]</dt>
1782 <dd>
1783 <p>Show colored diff.
1784 <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
1785 <em>&lt;when&gt;</em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.</p>
1786 </dd>
1787 <dt class="hdlist1">--no-color</dt>
1788 <dd>
1789 <p>Turn off colored diff.
1790 It is the same as <code>--color=never</code>.</p>
1791 </dd>
1792 <dt class="hdlist1">--color-moved[=&lt;mode&gt;]</dt>
1793 <dd>
1794 <p>Moved lines of code are colored differently.
1795 The &lt;mode&gt; defaults to <em>no</em> if the option is not given
1796 and to <em>zebra</em> if the option with no mode is given.
1797 The mode must be one of:</p>
1798 <div class="openblock">
1799 <div class="content">
1800 <div class="dlist">
1801 <dl>
1802 <dt class="hdlist1">no</dt>
1803 <dd>
1804 <p>Moved lines are not highlighted.</p>
1805 </dd>
1806 <dt class="hdlist1">default</dt>
1807 <dd>
1808 <p>Is a synonym for <code>zebra</code>. This may change to a more sensible mode
1809 in the future.</p>
1810 </dd>
1811 <dt class="hdlist1">plain</dt>
1812 <dd>
1813 <p>Any line that is added in one location and was removed
1814 in another location will be colored with <em>color.diff.newMoved</em>.
1815 Similarly <em>color.diff.oldMoved</em> will be used for removed lines
1816 that are added somewhere else in the diff. This mode picks up any
1817 moved line, but it is not very useful in a review to determine
1818 if a block of code was moved without permutation.</p>
1819 </dd>
1820 <dt class="hdlist1">blocks</dt>
1821 <dd>
1822 <p>Blocks of moved text of at least 20 alphanumeric characters
1823 are detected greedily. The detected blocks are
1824 painted using either the <em>color.diff.{old,new}Moved</em> color.
1825 Adjacent blocks cannot be told apart.</p>
1826 </dd>
1827 <dt class="hdlist1">zebra</dt>
1828 <dd>
1829 <p>Blocks of moved text are detected as in <em>blocks</em> mode. The blocks
1830 are painted using either the <em>color.diff.{old,new}Moved</em> color or
1831 <em>color.diff.{old,new}MovedAlternative</em>. The change between
1832 the two colors indicates that a new block was detected.</p>
1833 </dd>
1834 <dt class="hdlist1">dimmed-zebra</dt>
1835 <dd>
1836 <p>Similar to <em>zebra</em>, but additional dimming of uninteresting parts
1837 of moved code is performed. The bordering lines of two adjacent
1838 blocks are considered interesting, the rest is uninteresting.
1839 <code>dimmed_zebra</code> is a deprecated synonym.</p>
1840 </dd>
1841 </dl>
1842 </div>
1843 </div>
1844 </div>
1845 </dd>
1846 <dt class="hdlist1">--no-color-moved</dt>
1847 <dd>
1848 <p>Turn off move detection. This can be used to override configuration
1849 settings. It is the same as <code>--color-moved=no</code>.</p>
1850 </dd>
1851 <dt class="hdlist1">--color-moved-ws=&lt;modes&gt;</dt>
1852 <dd>
1853 <p>This configures how whitespace is ignored when performing the
1854 move detection for <code>--color-moved</code>.
1855 These modes can be given as a comma separated list:</p>
1856 <div class="openblock">
1857 <div class="content">
1858 <div class="dlist">
1859 <dl>
1860 <dt class="hdlist1">no</dt>
1861 <dd>
1862 <p>Do not ignore whitespace when performing move detection.</p>
1863 </dd>
1864 <dt class="hdlist1">ignore-space-at-eol</dt>
1865 <dd>
1866 <p>Ignore changes in whitespace at EOL.</p>
1867 </dd>
1868 <dt class="hdlist1">ignore-space-change</dt>
1869 <dd>
1870 <p>Ignore changes in amount of whitespace.  This ignores whitespace
1871 at line end, and considers all other sequences of one or
1872 more whitespace characters to be equivalent.</p>
1873 </dd>
1874 <dt class="hdlist1">ignore-all-space</dt>
1875 <dd>
1876 <p>Ignore whitespace when comparing lines. This ignores differences
1877 even if one line has whitespace where the other line has none.</p>
1878 </dd>
1879 <dt class="hdlist1">allow-indentation-change</dt>
1880 <dd>
1881 <p>Initially ignore any whitespace in the move detection, then
1882 group the moved code blocks only into a block if the change in
1883 whitespace is the same per line. This is incompatible with the
1884 other modes.</p>
1885 </dd>
1886 </dl>
1887 </div>
1888 </div>
1889 </div>
1890 </dd>
1891 <dt class="hdlist1">--no-color-moved-ws</dt>
1892 <dd>
1893 <p>Do not ignore whitespace when performing move detection. This can be
1894 used to override configuration settings. It is the same as
1895 <code>--color-moved-ws=no</code>.</p>
1896 </dd>
1897 <dt class="hdlist1">--word-diff[=&lt;mode&gt;]</dt>
1898 <dd>
1899 <p>Show a word diff, using the &lt;mode&gt; to delimit changed words.
1900 By default, words are delimited by whitespace; see
1901 <code>--word-diff-regex</code> below.  The &lt;mode&gt; defaults to <em>plain</em>, and
1902 must be one of:</p>
1903 <div class="openblock">
1904 <div class="content">
1905 <div class="dlist">
1906 <dl>
1907 <dt class="hdlist1">color</dt>
1908 <dd>
1909 <p>Highlight changed words using only colors.  Implies <code>--color</code>.</p>
1910 </dd>
1911 <dt class="hdlist1">plain</dt>
1912 <dd>
1913 <p>Show words as <code>[-removed-]</code> and <code>{+added+}</code>.  Makes no
1914 attempts to escape the delimiters if they appear in the input,
1915 so the output may be ambiguous.</p>
1916 </dd>
1917 <dt class="hdlist1">porcelain</dt>
1918 <dd>
1919 <p>Use a special line-based format intended for script
1920 consumption.  Added/removed/unchanged runs are printed in the
1921 usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
1922 character at the beginning of the line and extending to the
1923 end of the line.  Newlines in the input are represented by a
1924 tilde <code>~</code> on a line of its own.</p>
1925 </dd>
1926 <dt class="hdlist1">none</dt>
1927 <dd>
1928 <p>Disable word diff again.</p>
1929 </dd>
1930 </dl>
1931 </div>
1932 </div>
1933 </div>
1934 <div class="paragraph">
1935 <p>Note that despite the name of the first mode, color is used to
1936 highlight the changed parts in all modes if enabled.</p>
1937 </div>
1938 </dd>
1939 <dt class="hdlist1">--word-diff-regex=&lt;regex&gt;</dt>
1940 <dd>
1941 <p>Use &lt;regex&gt; to decide what a word is, instead of considering
1942 runs of non-whitespace to be a word.  Also implies
1943 <code>--word-diff</code> unless it was already enabled.</p>
1944 <div class="paragraph">
1945 <p>Every non-overlapping match of the
1946 &lt;regex&gt; is considered a word.  Anything between these matches is
1947 considered whitespace and ignored(!) for the purposes of finding
1948 differences.  You may want to append <code>|[^[:space:]]</code> to your regular
1949 expression to make sure that it matches all non-whitespace characters.
1950 A match that contains a newline is silently truncated(!) at the
1951 newline.</p>
1952 </div>
1953 <div class="paragraph">
1954 <p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1955 and, correspondingly, show differences character by character.</p>
1956 </div>
1957 <div class="paragraph">
1958 <p>The regex can also be set via a diff driver or configuration option, see
1959 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>.  Giving it explicitly
1960 overrides any diff driver or configuration setting.  Diff drivers
1961 override configuration settings.</p>
1962 </div>
1963 </dd>
1964 <dt class="hdlist1">--color-words[=&lt;regex&gt;]</dt>
1965 <dd>
1966 <p>Equivalent to <code>--word-diff=color</code> plus (if a regex was
1967 specified) <code>--word-diff-regex=&lt;regex&gt;</code>.</p>
1968 </dd>
1969 <dt class="hdlist1">--no-renames</dt>
1970 <dd>
1971 <p>Turn off rename detection, even when the configuration
1972 file gives the default to do so.</p>
1973 </dd>
1974 <dt class="hdlist1">--[no-]rename-empty</dt>
1975 <dd>
1976 <p>Whether to use empty blobs as rename source.</p>
1977 </dd>
1978 <dt class="hdlist1">--check</dt>
1979 <dd>
1980 <p>Warn if changes introduce conflict markers or whitespace errors.
1981 What are considered whitespace errors is controlled by <code>core.whitespace</code>
1982 configuration.  By default, trailing whitespaces (including
1983 lines that consist solely of whitespaces) and a space character
1984 that is immediately followed by a tab character inside the
1985 initial indent of the line are considered whitespace errors.
1986 Exits with non-zero status if problems are found. Not compatible
1987 with --exit-code.</p>
1988 </dd>
1989 <dt class="hdlist1">--ws-error-highlight=&lt;kind&gt;</dt>
1990 <dd>
1991 <p>Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
1992 lines of the diff.  Multiple values are separated by comma,
1993 <code>none</code> resets previous values, <code>default</code> reset the list to
1994 <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>.  When
1995 this option is not given, and the configuration variable
1996 <code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
1997 <code>new</code> lines are highlighted. The whitespace errors are colored
1998 with <code>color.diff.whitespace</code>.</p>
1999 </dd>
2000 <dt class="hdlist1">--full-index</dt>
2001 <dd>
2002 <p>Instead of the first handful of characters, show the full
2003 pre- and post-image blob object names on the "index"
2004 line when generating patch format output.</p>
2005 </dd>
2006 <dt class="hdlist1">--binary</dt>
2007 <dd>
2008 <p>In addition to <code>--full-index</code>, output a binary diff that
2009 can be applied with <code>git-apply</code>.
2010 Implies <code>--patch</code>.</p>
2011 </dd>
2012 <dt class="hdlist1">--abbrev[=&lt;n&gt;]</dt>
2013 <dd>
2014 <p>Instead of showing the full 40-byte hexadecimal object
2015 name in diff-raw format output and diff-tree header
2016 lines, show the shortest prefix that is at least <em>&lt;n&gt;</em>
2017 hexdigits long that uniquely refers the object.
2018 In diff-patch output format, <code>--full-index</code> takes higher
2019 precedence, i.e. if <code>--full-index</code> is specified, full blob
2020 names will be shown regardless of <code>--abbrev</code>.
2021 Non default number of digits can be specified with <code>--abbrev=&lt;n&gt;</code>.</p>
2022 </dd>
2023 <dt class="hdlist1">-B[&lt;n&gt;][/&lt;m&gt;]</dt>
2024 <dt class="hdlist1">--break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]</dt>
2025 <dd>
2026 <p>Break complete rewrite changes into pairs of delete and
2027 create. This serves two purposes:</p>
2028 <div class="paragraph">
2029 <p>It affects the way a change that amounts to a total rewrite of a file
2030 not as a series of deletion and insertion mixed together with a very
2031 few lines that happen to match textually as the context, but as a
2032 single deletion of everything old followed by a single insertion of
2033 everything new, and the number <code>m</code> controls this aspect of the -B
2034 option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
2035 original should remain in the result for Git to consider it a total
2036 rewrite (i.e. otherwise the resulting patch will be a series of
2037 deletion and insertion mixed together with context lines).</p>
2038 </div>
2039 <div class="paragraph">
2040 <p>When used with -M, a totally-rewritten file is also considered as the
2041 source of a rename (usually -M only considers a file that disappeared
2042 as the source of a rename), and the number <code>n</code> controls this aspect of
2043 the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
2044 addition and deletion compared to 20% or more of the file&#8217;s size are
2045 eligible for being picked up as a possible source of a rename to
2046 another file.</p>
2047 </div>
2048 </dd>
2049 <dt class="hdlist1">-M[&lt;n&gt;]</dt>
2050 <dt class="hdlist1">--find-renames[=&lt;n&gt;]</dt>
2051 <dd>
2052 <p>If generating diffs, detect and report renames for each commit.
2053 For following files across renames while traversing history, see
2054 <code>--follow</code>.
2055 If <code>n</code> is specified, it is a threshold on the similarity
2056 index (i.e. amount of addition/deletions compared to the
2057 file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
2058 delete/add pair to be a rename if more than 90% of the file
2059 hasn&#8217;t changed.  Without a <code>%</code> sign, the number is to be read as
2060 a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
2061 0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
2062 the same as <code>-M5%</code>.  To limit detection to exact renames, use
2063 <code>-M100%</code>.  The default similarity index is 50%.</p>
2064 </dd>
2065 <dt class="hdlist1">-C[&lt;n&gt;]</dt>
2066 <dt class="hdlist1">--find-copies[=&lt;n&gt;]</dt>
2067 <dd>
2068 <p>Detect copies as well as renames.  See also <code>--find-copies-harder</code>.
2069 If <code>n</code> is specified, it has the same meaning as for <code>-M&lt;n&gt;</code>.</p>
2070 </dd>
2071 <dt class="hdlist1">--find-copies-harder</dt>
2072 <dd>
2073 <p>For performance reasons, by default, <code>-C</code> option finds copies only
2074 if the original file of the copy was modified in the same
2075 changeset.  This flag makes the command
2076 inspect unmodified files as candidates for the source of
2077 copy.  This is a very expensive operation for large
2078 projects, so use it with caution.  Giving more than one
2079 <code>-C</code> option has the same effect.</p>
2080 </dd>
2081 <dt class="hdlist1">-D</dt>
2082 <dt class="hdlist1">--irreversible-delete</dt>
2083 <dd>
2084 <p>Omit the preimage for deletes, i.e. print only the header but not
2085 the diff between the preimage and <code>/dev/null</code>. The resulting patch
2086 is not meant to be applied with <code>patch</code> or <code>git apply</code>; this is
2087 solely for people who want to just concentrate on reviewing the
2088 text after the change. In addition, the output obviously lacks
2089 enough information to apply such a patch in reverse, even manually,
2090 hence the name of the option.</p>
2091 <div class="paragraph">
2092 <p>When used together with <code>-B</code>, omit also the preimage in the deletion part
2093 of a delete/create pair.</p>
2094 </div>
2095 </dd>
2096 <dt class="hdlist1">-l&lt;num&gt;</dt>
2097 <dd>
2098 <p>The <code>-M</code> and <code>-C</code> options involve some preliminary steps that
2099 can detect subsets of renames/copies cheaply, followed by an
2100 exhaustive fallback portion that compares all remaining
2101 unpaired destinations to all relevant sources.  (For renames,
2102 only remaining unpaired sources are relevant; for copies, all
2103 original sources are relevant.)  For N sources and
2104 destinations, this exhaustive check is O(N^2).  This option
2105 prevents the exhaustive portion of rename/copy detection from
2106 running if the number of source/destination files involved
2107 exceeds the specified number.  Defaults to diff.renameLimit.
2108 Note that a value of 0 is treated as unlimited.</p>
2109 </dd>
2110 <dt class="hdlist1">--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;&#8203;[*]]</dt>
2111 <dd>
2112 <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
2113 Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
2114 type (i.e. regular file, symlink, submodule, &#8230;&#8203;) changed (<code>T</code>),
2115 are Unmerged (<code>U</code>), are
2116 Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
2117 Any combination of the filter characters (including none) can be used.
2118 When <code>*</code> (All-or-none) is added to the combination, all
2119 paths are selected if there is any file that matches
2120 other criteria in the comparison; if there is no file
2121 that matches other criteria, nothing is selected.</p>
2122 <div class="paragraph">
2123 <p>Also, these upper-case letters can be downcased to exclude.  E.g.
2124 <code>--diff-filter=ad</code> excludes added and deleted paths.</p>
2125 </div>
2126 <div class="paragraph">
2127 <p>Note that not all diffs can feature all types. For instance, copied and
2128 renamed entries cannot appear if detection for those types is disabled.</p>
2129 </div>
2130 </dd>
2131 <dt class="hdlist1">-S&lt;string&gt;</dt>
2132 <dd>
2133 <p>Look for differences that change the number of occurrences of
2134 the specified string (i.e. addition/deletion) in a file.
2135 Intended for the scripter&#8217;s use.</p>
2136 <div class="paragraph">
2137 <p>It is useful when you&#8217;re looking for an exact block of code (like a
2138 struct), and want to know the history of that block since it first
2139 came into being: use the feature iteratively to feed the interesting
2140 block in the preimage back into <code>-S</code>, and keep going until you get the
2141 very first version of the block.</p>
2142 </div>
2143 <div class="paragraph">
2144 <p>Binary files are searched as well.</p>
2145 </div>
2146 </dd>
2147 <dt class="hdlist1">-G&lt;regex&gt;</dt>
2148 <dd>
2149 <p>Look for differences whose patch text contains added/removed
2150 lines that match &lt;regex&gt;.</p>
2151 <div class="paragraph">
2152 <p>To illustrate the difference between <code>-S&lt;regex&gt; --pickaxe-regex</code> and
2153 <code>-G&lt;regex&gt;</code>, consider a commit with the following diff in the same
2154 file:</p>
2155 </div>
2156 <div class="listingblock">
2157 <div class="content">
2158 <pre>+    return frotz(nitfol, two-&gt;ptr, 1, 0);
2159 ...
2160 -    hit = frotz(nitfol, mf2.ptr, 1, 0);</pre>
2161 </div>
2162 </div>
2163 <div class="paragraph">
2164 <p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
2165 -S"frotz\(nitfol" --pickaxe-regex</code> will not (because the number of
2166 occurrences of that string did not change).</p>
2167 </div>
2168 <div class="paragraph">
2169 <p>Unless <code>--text</code> is supplied patches of binary files without a textconv
2170 filter will be ignored.</p>
2171 </div>
2172 <div class="paragraph">
2173 <p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
2174 information.</p>
2175 </div>
2176 </dd>
2177 <dt class="hdlist1">--find-object=&lt;object-id&gt;</dt>
2178 <dd>
2179 <p>Look for differences that change the number of occurrences of
2180 the specified object. Similar to <code>-S</code>, just the argument is different
2181 in that it doesn&#8217;t search for a specific string but for a specific
2182 object id.</p>
2183 <div class="paragraph">
2184 <p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
2185 <code>git-log</code> to also find trees.</p>
2186 </div>
2187 </dd>
2188 <dt class="hdlist1">--pickaxe-all</dt>
2189 <dd>
2190 <p>When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
2191 changeset, not just the files that contain the change
2192 in &lt;string&gt;.</p>
2193 </dd>
2194 <dt class="hdlist1">--pickaxe-regex</dt>
2195 <dd>
2196 <p>Treat the &lt;string&gt; given to <code>-S</code> as an extended POSIX regular
2197 expression to match.</p>
2198 </dd>
2199 <dt class="hdlist1">-O&lt;orderfile&gt;</dt>
2200 <dd>
2201 <p>Control the order in which files appear in the output.
2202 This overrides the <code>diff.orderFile</code> configuration variable
2203 (see <a href="git-config.html">git-config(1)</a>).  To cancel <code>diff.orderFile</code>,
2204 use <code>-O/dev/null</code>.</p>
2205 <div class="paragraph">
2206 <p>The output order is determined by the order of glob patterns in
2207 &lt;orderfile&gt;.
2208 All files with pathnames that match the first pattern are output
2209 first, all files with pathnames that match the second pattern (but not
2210 the first) are output next, and so on.
2211 All files with pathnames that do not match any pattern are output
2212 last, as if there was an implicit match-all pattern at the end of the
2213 file.
2214 If multiple pathnames have the same rank (they match the same pattern
2215 but no earlier patterns), their output order relative to each other is
2216 the normal order.</p>
2217 </div>
2218 <div class="paragraph">
2219 <p>&lt;orderfile&gt; is parsed as follows:</p>
2220 </div>
2221 <div class="openblock">
2222 <div class="content">
2223 <div class="ulist">
2224 <ul>
2225 <li>
2226 <p>Blank lines are ignored, so they can be used as separators for
2227 readability.</p>
2228 </li>
2229 <li>
2230 <p>Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
2231 for comments.  Add a backslash ("<code>\</code>") to the beginning of the
2232 pattern if it starts with a hash.</p>
2233 </li>
2234 <li>
2235 <p>Each other line contains a single pattern.</p>
2236 </li>
2237 </ul>
2238 </div>
2239 </div>
2240 </div>
2241 <div class="paragraph">
2242 <p>Patterns have the same syntax and semantics as patterns used for
2243 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
2244 matches a pattern if removing any number of the final pathname
2245 components matches the pattern.  For example, the pattern "<code>foo*bar</code>"
2246 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p>
2247 </div>
2248 </dd>
2249 <dt class="hdlist1">--skip-to=&lt;file&gt;</dt>
2250 <dt class="hdlist1">--rotate-to=&lt;file&gt;</dt>
2251 <dd>
2252 <p>Discard the files before the named &lt;file&gt; from the output
2253 (i.e. <em>skip to</em>), or move them to the end of the output
2254 (i.e. <em>rotate to</em>).  These options were invented primarily for the use
2255 of the <code>git difftool</code> command, and may not be very useful
2256 otherwise.</p>
2257 </dd>
2258 <dt class="hdlist1">-R</dt>
2259 <dd>
2260 <p>Swap two inputs; that is, show differences from index or
2261 on-disk file to tree contents.</p>
2262 </dd>
2263 <dt class="hdlist1">--relative[=&lt;path&gt;]</dt>
2264 <dt class="hdlist1">--no-relative</dt>
2265 <dd>
2266 <p>When run from a subdirectory of the project, it can be
2267 told to exclude changes outside the directory and show
2268 pathnames relative to it with this option.  When you are
2269 not in a subdirectory (e.g. in a bare repository), you
2270 can name which subdirectory to make the output relative
2271 to by giving a &lt;path&gt; as an argument.
2272 <code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config
2273 option and previous <code>--relative</code>.</p>
2274 </dd>
2275 <dt class="hdlist1">-a</dt>
2276 <dt class="hdlist1">--text</dt>
2277 <dd>
2278 <p>Treat all files as text.</p>
2279 </dd>
2280 <dt class="hdlist1">--ignore-cr-at-eol</dt>
2281 <dd>
2282 <p>Ignore carriage-return at the end of line when doing a comparison.</p>
2283 </dd>
2284 <dt class="hdlist1">--ignore-space-at-eol</dt>
2285 <dd>
2286 <p>Ignore changes in whitespace at EOL.</p>
2287 </dd>
2288 <dt class="hdlist1">-b</dt>
2289 <dt class="hdlist1">--ignore-space-change</dt>
2290 <dd>
2291 <p>Ignore changes in amount of whitespace.  This ignores whitespace
2292 at line end, and considers all other sequences of one or
2293 more whitespace characters to be equivalent.</p>
2294 </dd>
2295 <dt class="hdlist1">-w</dt>
2296 <dt class="hdlist1">--ignore-all-space</dt>
2297 <dd>
2298 <p>Ignore whitespace when comparing lines.  This ignores
2299 differences even if one line has whitespace where the other
2300 line has none.</p>
2301 </dd>
2302 <dt class="hdlist1">--ignore-blank-lines</dt>
2303 <dd>
2304 <p>Ignore changes whose lines are all blank.</p>
2305 </dd>
2306 <dt class="hdlist1">-I&lt;regex&gt;</dt>
2307 <dt class="hdlist1">--ignore-matching-lines=&lt;regex&gt;</dt>
2308 <dd>
2309 <p>Ignore changes whose all lines match &lt;regex&gt;.  This option may
2310 be specified more than once.</p>
2311 </dd>
2312 <dt class="hdlist1">--inter-hunk-context=&lt;lines&gt;</dt>
2313 <dd>
2314 <p>Show the context between diff hunks, up to the specified number
2315 of lines, thereby fusing hunks that are close to each other.
2316 Defaults to <code>diff.interHunkContext</code> or 0 if the config option
2317 is unset.</p>
2318 </dd>
2319 <dt class="hdlist1">-W</dt>
2320 <dt class="hdlist1">--function-context</dt>
2321 <dd>
2322 <p>Show whole function as context lines for each change.
2323 The function names are determined in the same way as
2324 <code>git diff</code> works out patch hunk headers (see <em>Defining a
2325 custom hunk-header</em> in <a href="gitattributes.html">gitattributes(5)</a>).</p>
2326 </dd>
2327 <dt class="hdlist1">--ext-diff</dt>
2328 <dd>
2329 <p>Allow an external diff helper to be executed. If you set an
2330 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
2331 to use this option with <a href="git-log.html">git-log(1)</a> and friends.</p>
2332 </dd>
2333 <dt class="hdlist1">--no-ext-diff</dt>
2334 <dd>
2335 <p>Disallow external diff drivers.</p>
2336 </dd>
2337 <dt class="hdlist1">--textconv</dt>
2338 <dt class="hdlist1">--no-textconv</dt>
2339 <dd>
2340 <p>Allow (or disallow) external text conversion filters to be run
2341 when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
2342 details. Because textconv filters are typically a one-way
2343 conversion, the resulting diff is suitable for human
2344 consumption, but cannot be applied. For this reason, textconv
2345 filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
2346 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
2347 diff plumbing commands.</p>
2348 </dd>
2349 <dt class="hdlist1">--ignore-submodules[=&lt;when&gt;]</dt>
2350 <dd>
2351 <p>Ignore changes to submodules in the diff generation. &lt;when&gt; can be
2352 either "none", "untracked", "dirty" or "all", which is the default.
2353 Using "none" will consider the submodule modified when it either contains
2354 untracked or modified files or its HEAD differs from the commit recorded
2355 in the superproject and can be used to override any settings of the
2356 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2357 "untracked" is used submodules are not considered dirty when they only
2358 contain untracked content (but they are still scanned for modified
2359 content). Using "dirty" ignores all changes to the work tree of submodules,
2360 only changes to the commits stored in the superproject are shown (this was
2361 the behavior until 1.7.0). Using "all" hides all changes to submodules.</p>
2362 </dd>
2363 <dt class="hdlist1">--src-prefix=&lt;prefix&gt;</dt>
2364 <dd>
2365 <p>Show the given source prefix instead of "a/".</p>
2366 </dd>
2367 <dt class="hdlist1">--dst-prefix=&lt;prefix&gt;</dt>
2368 <dd>
2369 <p>Show the given destination prefix instead of "b/".</p>
2370 </dd>
2371 <dt class="hdlist1">--no-prefix</dt>
2372 <dd>
2373 <p>Do not show any source or destination prefix.</p>
2374 </dd>
2375 <dt class="hdlist1">--default-prefix</dt>
2376 <dd>
2377 <p>Use the default source and destination prefixes ("a/" and "b/").
2378 This overrides configuration variables such as <code>diff.noprefix</code>,
2379 <code>diff.srcPrefix</code>, <code>diff.dstPrefix</code>, and <code>diff.mnemonicPrefix</code>
2380 (see <code>git-config</code>(1)).</p>
2381 </dd>
2382 <dt class="hdlist1">--line-prefix=&lt;prefix&gt;</dt>
2383 <dd>
2384 <p>Prepend an additional prefix to every line of output.</p>
2385 </dd>
2386 <dt class="hdlist1">--ita-invisible-in-index</dt>
2387 <dd>
2388 <p>By default entries added by "git add -N" appear as an existing
2389 empty file in "git diff" and a new file in "git diff --cached".
2390 This option makes the entry appear as a new file in "git diff"
2391 and non-existent in "git diff --cached". This option could be
2392 reverted with <code>--ita-visible-in-index</code>. Both options are
2393 experimental and could be removed in future.</p>
2394 </dd>
2395 </dl>
2396 </div>
2397 <div class="paragraph">
2398 <p>For more detailed explanation on these common options, see also
2399 <a href="gitdiffcore.html">gitdiffcore(7)</a>.</p>
2400 </div>
2401 </div>
2402 </div>
2403 <div class="sect1">
2404 <h2 id="generate_patch_text_with_p">Generating patch text with -p</h2>
2405 <div class="sectionbody">
2406 <div class="paragraph">
2407 <p>Running
2408 <a href="git-diff.html">git-diff(1)</a>,
2409 <a href="git-log.html">git-log(1)</a>,
2410 <a href="git-show.html">git-show(1)</a>,
2411 <a href="git-diff-index.html">git-diff-index(1)</a>,
2412 <a href="git-diff-tree.html">git-diff-tree(1)</a>, or
2413 <a href="git-diff-files.html">git-diff-files(1)</a>
2414 with the <code>-p</code> option produces patch text.
2415 You can customize the creation of patch text via the
2416 <code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables
2417 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p>
2418 </div>
2419 <div class="paragraph">
2420 <p>What the -p option produces is slightly different from the traditional
2421 diff format:</p>
2422 </div>
2423 <div class="olist arabic">
2424 <ol class="arabic">
2425 <li>
2426 <p>It is preceded by a "git diff" header that looks like this:</p>
2427 <div class="literalblock">
2428 <div class="content">
2429 <pre>diff --git a/file1 b/file2</pre>
2430 </div>
2431 </div>
2432 <div class="paragraph">
2433 <p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
2434 involved.  Especially, even for a creation or a deletion,
2435 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p>
2436 </div>
2437 <div class="paragraph">
2438 <p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
2439 name of the source file of the rename/copy and the name of
2440 the file that the rename/copy produces, respectively.</p>
2441 </div>
2442 </li>
2443 <li>
2444 <p>It is followed by one or more extended header lines:</p>
2445 <div class="literalblock">
2446 <div class="content">
2447 <pre>old mode &lt;mode&gt;
2448 new mode &lt;mode&gt;
2449 deleted file mode &lt;mode&gt;
2450 new file mode &lt;mode&gt;
2451 copy from &lt;path&gt;
2452 copy to &lt;path&gt;
2453 rename from &lt;path&gt;
2454 rename to &lt;path&gt;
2455 similarity index &lt;number&gt;
2456 dissimilarity index &lt;number&gt;
2457 index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</pre>
2458 </div>
2459 </div>
2460 <div class="paragraph">
2461 <p>File modes are printed as 6-digit octal numbers including the file type
2462 and file permission bits.</p>
2463 </div>
2464 <div class="paragraph">
2465 <p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p>
2466 </div>
2467 <div class="paragraph">
2468 <p>The similarity index is the percentage of unchanged lines, and
2469 the dissimilarity index is the percentage of changed lines.  It
2470 is a rounded down integer, followed by a percent sign.  The
2471 similarity index value of 100% is thus reserved for two equal
2472 files, while 100% dissimilarity means that no line from the old
2473 file made it into the new one.</p>
2474 </div>
2475 <div class="paragraph">
2476 <p>The index line includes the blob object names before and after the change.
2477 The &lt;mode&gt; is included if the file mode does not change; otherwise,
2478 separate lines indicate the old and the new mode.</p>
2479 </div>
2480 </li>
2481 <li>
2482 <p>Pathnames with "unusual" characters are quoted as explained for
2483 the configuration variable <code>core.quotePath</code> (see
2484 <a href="git-config.html">git-config(1)</a>).</p>
2485 </li>
2486 <li>
2487 <p>All the <code>file1</code> files in the output refer to files before the
2488 commit, and all the <code>file2</code> files refer to files after the commit.
2489 It is incorrect to apply each change to each file sequentially.  For
2490 example, this patch will swap a and b:</p>
2491 <div class="literalblock">
2492 <div class="content">
2493 <pre>diff --git a/a b/b
2494 rename from a
2495 rename to b
2496 diff --git a/b b/a
2497 rename from b
2498 rename to a</pre>
2499 </div>
2500 </div>
2501 </li>
2502 <li>
2503 <p>Hunk headers mention the name of the function to which the hunk
2504 applies.  See "Defining a custom hunk-header" in
2505 <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
2506 specific languages.</p>
2507 </li>
2508 </ol>
2509 </div>
2510 </div>
2511 </div>
2512 <div class="sect1">
2513 <h2 id="_combined_diff_format">Combined diff format</h2>
2514 <div class="sectionbody">
2515 <div class="paragraph">
2516 <p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
2517 produce a <em>combined diff</em> when showing a merge. This is the default
2518 format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
2519 <a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
2520 <code>--diff-merges</code> option to any of these commands to force generation of
2521 diffs in a specific format.</p>
2522 </div>
2523 <div class="paragraph">
2524 <p>A "combined diff" format looks like this:</p>
2525 </div>
2526 <div class="listingblock">
2527 <div class="content">
2528 <pre>diff --combined describe.c
2529 index fabadb8,cc95eb0..4866510
2530 --- a/describe.c
2531 +++ b/describe.c
2532 @@@ -98,20 -98,12 +98,20 @@@
2533         return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
2534   }
2535
2536 - static void describe(char *arg)
2537  -static void describe(struct commit *cmit, int last_one)
2538 ++static void describe(char *arg, int last_one)
2539   {
2540  +      unsigned char sha1[20];
2541  +      struct commit *cmit;
2542         struct commit_list *list;
2543         static int initialized = 0;
2544         struct commit_name *n;
2545
2546  +      if (get_sha1(arg, sha1) &lt; 0)
2547  +              usage(describe_usage);
2548  +      cmit = lookup_commit_reference(sha1);
2549  +      if (!cmit)
2550  +              usage(describe_usage);
2551  +
2552         if (!initialized) {
2553                 initialized = 1;
2554                 for_each_ref(get_name);</pre>
2555 </div>
2556 </div>
2557 <div class="olist arabic">
2558 <ol class="arabic">
2559 <li>
2560 <p>It is preceded by a "git diff" header, that looks like
2561 this (when the <code>-c</code> option is used):</p>
2562 <div class="literalblock">
2563 <div class="content">
2564 <pre>diff --combined file</pre>
2565 </div>
2566 </div>
2567 <div class="paragraph">
2568 <p>or like this (when the <code>--cc</code> option is used):</p>
2569 </div>
2570 <div class="literalblock">
2571 <div class="content">
2572 <pre>diff --cc file</pre>
2573 </div>
2574 </div>
2575 </li>
2576 <li>
2577 <p>It is followed by one or more extended header lines
2578 (this example shows a merge with two parents):</p>
2579 <div class="literalblock">
2580 <div class="content">
2581 <pre>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
2582 mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
2583 new file mode &lt;mode&gt;
2584 deleted file mode &lt;mode&gt;,&lt;mode&gt;</pre>
2585 </div>
2586 </div>
2587 <div class="paragraph">
2588 <p>The <code>mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;</code> line appears only if at least one of
2589 the &lt;mode&gt; is different from the rest. Extended headers with
2590 information about detected content movement (renames and
2591 copying detection) are designed to work with the diff of two
2592 &lt;tree-ish&gt; and are not used by combined diff format.</p>
2593 </div>
2594 </li>
2595 <li>
2596 <p>It is followed by a two-line from-file/to-file header:</p>
2597 <div class="literalblock">
2598 <div class="content">
2599 <pre>--- a/file
2600 +++ b/file</pre>
2601 </div>
2602 </div>
2603 <div class="paragraph">
2604 <p>Similar to the two-line header for the traditional <em>unified</em> diff
2605 format, <code>/dev/null</code> is used to signal created or deleted
2606 files.</p>
2607 </div>
2608 <div class="paragraph">
2609 <p>However, if the --combined-all-paths option is provided, instead of a
2610 two-line from-file/to-file, you get an N+1 line from-file/to-file header,
2611 where N is the number of parents in the merge commit:</p>
2612 </div>
2613 <div class="literalblock">
2614 <div class="content">
2615 <pre>--- a/file
2616 --- a/file
2617 --- a/file
2618 +++ b/file</pre>
2619 </div>
2620 </div>
2621 <div class="paragraph">
2622 <p>This extended format can be useful if rename or copy detection is
2623 active, to allow you to see the original name of the file in different
2624 parents.</p>
2625 </div>
2626 </li>
2627 <li>
2628 <p>Chunk header format is modified to prevent people from
2629 accidentally feeding it to <code>patch -p1</code>. Combined diff format
2630 was created for review of merge commit changes, and was not
2631 meant to be applied. The change is similar to the change in the
2632 extended <em>index</em> header:</p>
2633 <div class="literalblock">
2634 <div class="content">
2635 <pre>@@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@</pre>
2636 </div>
2637 </div>
2638 <div class="paragraph">
2639 <p>There are (number of parents + 1) <code>@</code> characters in the chunk
2640 header for combined diff format.</p>
2641 </div>
2642 </li>
2643 </ol>
2644 </div>
2645 <div class="paragraph">
2646 <p>Unlike the traditional <em>unified</em> diff format, which shows two
2647 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
2648 added to B), or <code>" "</code> (space&#8201;&#8212;&#8201;unchanged) prefix, this format
2649 compares two or more files file1, file2,&#8230;&#8203; with one file X, and
2650 shows how X differs from each of fileN.  One column for each of
2651 fileN is prepended to the output line to note how X&#8217;s line is
2652 different from it.</p>
2653 </div>
2654 <div class="paragraph">
2655 <p>A <code>-</code> character in the column N means that the line appears in
2656 fileN but it does not appear in the result.  A <code>+</code> character
2657 in the column N means that the line appears in the result,
2658 and fileN does not have that line (in other words, the line was
2659 added, from the point of view of that parent).</p>
2660 </div>
2661 <div class="paragraph">
2662 <p>In the above example output, the function signature was changed
2663 from both files (hence two <code>-</code> removals from both file1 and
2664 file2, plus <code>++</code> to mean one line that was added does not appear
2665 in either file1 or file2).  Also, eight other lines are the same
2666 from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p>
2667 </div>
2668 <div class="paragraph">
2669 <p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
2670 merge commit with the merge result (i.e. file1..fileN are the
2671 parents).  When shown by <code>git diff-files -c</code>, it compares the
2672 two unresolved merge parents with the working tree file
2673 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
2674 "their version").</p>
2675 </div>
2676 </div>
2677 </div>
2678 <div class="sect1">
2679 <h2 id="_examples">EXAMPLES</h2>
2680 <div class="sectionbody">
2681 <div class="dlist">
2682 <dl>
2683 <dt class="hdlist1"><code>git show v1.0.0</code></dt>
2684 <dd>
2685 <p>Shows the tag <code>v1.0.0</code>, along with the object the tag
2686 points at.</p>
2687 </dd>
2688 <dt class="hdlist1"><code>git show v1.0.0^{tree}</code></dt>
2689 <dd>
2690 <p>Shows the tree pointed to by the tag <code>v1.0.0</code>.</p>
2691 </dd>
2692 <dt class="hdlist1"><code>git show -s --format=%s v1.0.0^{commit}</code></dt>
2693 <dd>
2694 <p>Shows the subject of the commit pointed to by the
2695 tag <code>v1.0.0</code>.</p>
2696 </dd>
2697 <dt class="hdlist1"><code>git show next~10:Documentation/README</code></dt>
2698 <dd>
2699 <p>Shows the contents of the file <code>Documentation/README</code> as
2700 they were current in the 10th last commit of the branch
2701 <code>next</code>.</p>
2702 </dd>
2703 <dt class="hdlist1"><code>git show master:Makefile master:t/Makefile</code></dt>
2704 <dd>
2705 <p>Concatenates the contents of said Makefiles in the head
2706 of the branch <code>master</code>.</p>
2707 </dd>
2708 </dl>
2709 </div>
2710 </div>
2711 </div>
2712 <div class="sect1">
2713 <h2 id="_discussion">DISCUSSION</h2>
2714 <div class="sectionbody">
2715 <div class="paragraph">
2716 <p>Git is to some extent character encoding agnostic.</p>
2717 </div>
2718 <div class="ulist">
2719 <ul>
2720 <li>
2721 <p>The contents of the blob objects are uninterpreted sequences
2722 of bytes.  There is no encoding translation at the core
2723 level.</p>
2724 </li>
2725 <li>
2726 <p>Path names are encoded in UTF-8 normalization form C. This
2727 applies to tree objects, the index file, ref names, as well as
2728 path names in command line arguments, environment variables
2729 and config files (<code>.git/config</code> (see <a href="git-config.html">git-config(1)</a>),
2730 <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and
2731 <a href="gitmodules.html">gitmodules(5)</a>).</p>
2732 <div class="paragraph">
2733 <p>Note that Git at the core level treats path names simply as
2734 sequences of non-NUL bytes, there are no path name encoding
2735 conversions (except on Mac and Windows). Therefore, using
2736 non-ASCII path names will mostly work even on platforms and file
2737 systems that use legacy extended ASCII encodings. However,
2738 repositories created on such systems will not work properly on
2739 UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa.
2740 Additionally, many Git-based tools simply assume path names to
2741 be UTF-8 and will fail to display other encodings correctly.</p>
2742 </div>
2743 </li>
2744 <li>
2745 <p>Commit log messages are typically encoded in UTF-8, but other
2746 extended ASCII encodings are also supported. This includes
2747 ISO-8859-x, CP125x and many others, but <em>not</em> UTF-16/32,
2748 EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5,
2749 EUC-x, CP9xx etc.).</p>
2750 </li>
2751 </ul>
2752 </div>
2753 <div class="paragraph">
2754 <p>Although we encourage that the commit log messages are encoded
2755 in UTF-8, both the core and Git Porcelain are designed not to
2756 force UTF-8 on projects.  If all participants of a particular
2757 project find it more convenient to use legacy encodings, Git
2758 does not forbid it.  However, there are a few things to keep in
2759 mind.</p>
2760 </div>
2761 <div class="olist arabic">
2762 <ol class="arabic">
2763 <li>
2764 <p><em>git commit</em> and <em>git commit-tree</em> issue
2765 a warning if the commit log message given to it does not look
2766 like a valid UTF-8 string, unless you explicitly say your
2767 project uses a legacy encoding.  The way to say this is to
2768 have <code>i18n.commitEncoding</code> in <code>.git/config</code> file, like this:</p>
2769 <div class="listingblock">
2770 <div class="content">
2771 <pre>[i18n]
2772         commitEncoding = ISO-8859-1</pre>
2773 </div>
2774 </div>
2775 <div class="paragraph">
2776 <p>Commit objects created with the above setting record the value
2777 of <code>i18n.commitEncoding</code> in their <code>encoding</code> header.  This is to
2778 help other people who look at them later.  Lack of this header
2779 implies that the commit log message is encoded in UTF-8.</p>
2780 </div>
2781 </li>
2782 <li>
2783 <p><em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the
2784 <code>encoding</code> header of a commit object, and try to re-code the
2785 log message into UTF-8 unless otherwise specified.  You can
2786 specify the desired output encoding with
2787 <code>i18n.logOutputEncoding</code> in <code>.git/config</code> file, like this:</p>
2788 <div class="listingblock">
2789 <div class="content">
2790 <pre>[i18n]
2791         logOutputEncoding = ISO-8859-1</pre>
2792 </div>
2793 </div>
2794 <div class="paragraph">
2795 <p>If you do not have this configuration variable, the value of
2796 <code>i18n.commitEncoding</code> is used instead.</p>
2797 </div>
2798 </li>
2799 </ol>
2800 </div>
2801 <div class="paragraph">
2802 <p>Note that we deliberately chose not to re-code the commit log
2803 message when a commit is made to force UTF-8 at the commit
2804 object level, because re-coding to UTF-8 is not necessarily a
2805 reversible operation.</p>
2806 </div>
2807 </div>
2808 </div>
2809 <div class="sect1">
2810 <h2 id="_git">GIT</h2>
2811 <div class="sectionbody">
2812 <div class="paragraph">
2813 <p>Part of the <a href="git.html">git(1)</a> suite</p>
2814 </div>
2815 </div>
2816 </div>
2817 </div>
2818 <div id="footer">
2819 <div id="footer-text">
2820 Last updated 2023-10-23 14:43:46 -0700
2821 </div>
2822 </div>
2823 </body>
2824 </html>