git-apply.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-apply(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-apply(1) Manual Page</h1>
 444 <h2 id="_name">NAME</h2>
 445 <div class="sectionbody">
 446 <p>git-apply - Apply a patch to files and/or to the index</p>
 447 </div>
 448 </div>
 449 <div id="content">
 450 <div class="sect1">
 451 <h2 id="_synopsis">SYNOPSIS</h2>
 452 <div class="sectionbody">
 453 <div class="verseblock">
 454 <pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check]
 455           [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
 456           [--apply] [--no-add] [--build-fake-ancestor=&lt;file&gt;] [-R | --reverse]
 457           [--allow-binary-replacement | --binary] [--reject] [-z]
 458           [-p&lt;n&gt;] [-C&lt;n&gt;] [--inaccurate-eof] [--recount] [--cached]
 459           [--ignore-space-change | --ignore-whitespace]
 460           [--whitespace=(nowarn|warn|fix|error|error-all)]
 461           [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--directory=&lt;root&gt;]
 462           [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [&lt;patch&gt;&#8230;&#8203;]</pre>
 463 </div>
 464 </div>
 465 </div>
 466 <div class="sect1">
 467 <h2 id="_description">DESCRIPTION</h2>
 468 <div class="sectionbody">
 469 <div class="paragraph">
 470 <p>Reads the supplied diff output (i.e. "a patch") and applies it to files.
 471 When running from a subdirectory in a repository, patched paths
 472 outside the directory are ignored.
 473 With the <code>--index</code> option, the patch is also applied to the index, and
 474 with the <code>--cached</code> option, the patch is only applied to the index.
 475 Without these options, the command applies the patch only to files,
 476 and does not require them to be in a Git repository.</p>
 477 </div>
 478 <div class="paragraph">
 479 <p>This command applies the patch but does not create a commit.  Use
 480 <a href="git-am.html">git-am(1)</a> to create commits from patches generated by
 481 <a href="git-format-patch.html">git-format-patch(1)</a> and/or received by email.</p>
 482 </div>
 483 </div>
 484 </div>
 485 <div class="sect1">
 486 <h2 id="_options">OPTIONS</h2>
 487 <div class="sectionbody">
 488 <div class="dlist">
 489 <dl>
 490 <dt class="hdlist1">&lt;patch&gt;&#8230;&#8203;</dt>
 491 <dd>
 492 <p>The files to read the patch from.  <em>-</em> can be used to read
 493 from the standard input.</p>
 494 </dd>
 495 <dt class="hdlist1">--stat</dt>
 496 <dd>
 497 <p>Instead of applying the patch, output diffstat for the
 498 input.  Turns off "apply".</p>
 499 </dd>
 500 <dt class="hdlist1">--numstat</dt>
 501 <dd>
 502 <p>Similar to <code>--stat</code>, but shows the number of added and
 503 deleted lines in decimal notation and the pathname without
 504 abbreviation, to make it more machine friendly.  For
 505 binary files, outputs two <code>-</code> instead of saying
 506 <code>0 0</code>.  Turns off "apply".</p>
 507 </dd>
 508 <dt class="hdlist1">--summary</dt>
 509 <dd>
 510 <p>Instead of applying the patch, output a condensed
 511 summary of information obtained from git diff extended
 512 headers, such as creations, renames, and mode changes.
 513 Turns off "apply".</p>
 514 </dd>
 515 <dt class="hdlist1">--check</dt>
 516 <dd>
 517 <p>Instead of applying the patch, see if the patch is
 518 applicable to the current working tree and/or the index
 519 file and detects errors.  Turns off "apply".</p>
 520 </dd>
 521 <dt class="hdlist1">--index</dt>
 522 <dd>
 523 <p>Apply the patch to both the index and the working tree (or
 524 merely check that it would apply cleanly to both if <code>--check</code> is
 525 in effect). Note that <code>--index</code> expects index entries and
 526 working tree copies for relevant paths to be identical (their
 527 contents and metadata such as file mode must match), and will
 528 raise an error if they are not, even if the patch would apply
 529 cleanly to both the index and the working tree in isolation.</p>
 530 </dd>
 531 <dt class="hdlist1">--cached</dt>
 532 <dd>
 533 <p>Apply the patch to just the index, without touching the working
 534 tree. If <code>--check</code> is in effect, merely check that it would
 535 apply cleanly to the index entry.</p>
 536 </dd>
 537 <dt class="hdlist1">--intent-to-add</dt>
 538 <dd>
 539 <p>When applying the patch only to the working tree, mark new
 540 files to be added to the index later (see <code>--intent-to-add</code>
 541 option in <a href="git-add.html">git-add(1)</a>). This option is ignored unless
 542 running in a Git repository and <code>--index</code> is not specified.
 543 Note that <code>--index</code> could be implied by other options such
 544 as <code>--cached</code> or <code>--3way</code>.</p>
 545 </dd>
 546 <dt class="hdlist1">-3</dt>
 547 <dt class="hdlist1">--3way</dt>
 548 <dd>
 549 <p>Attempt 3-way merge if the patch records the identity of blobs it is supposed
 550 to apply to and we have those blobs available locally, possibly leaving the
 551 conflict markers in the files in the working tree for the user to
 552 resolve.  This option implies the <code>--index</code> option unless the
 553 <code>--cached</code> option is used, and is incompatible with the <code>--reject</code> option.
 554 When used with the <code>--cached</code> option, any conflicts are left at higher stages
 555 in the cache.</p>
 556 </dd>
 557 <dt class="hdlist1">--ours</dt>
 558 <dt class="hdlist1">--theirs</dt>
 559 <dt class="hdlist1">--union</dt>
 560 <dd>
 561 <p>Instead of leaving conflicts in the file, resolve conflicts favouring
 562 our (or their or both) side of the lines. Requires --3way.</p>
 563 </dd>
 564 <dt class="hdlist1">--build-fake-ancestor=&lt;file&gt;</dt>
 565 <dd>
 566 <p>Newer <em>git diff</em> output has embedded <em>index information</em>
 567 for each blob to help identify the original version that
 568 the patch applies to.  When this flag is given, and if
 569 the original versions of the blobs are available locally,
 570 builds a temporary index containing those blobs.</p>
 571 <div class="paragraph">
 572 <p>When a pure mode change is encountered (which has no index information),
 573 the information is read from the current index instead.</p>
 574 </div>
 575 </dd>
 576 <dt class="hdlist1">-R</dt>
 577 <dt class="hdlist1">--reverse</dt>
 578 <dd>
 579 <p>Apply the patch in reverse.</p>
 580 </dd>
 581 <dt class="hdlist1">--reject</dt>
 582 <dd>
 583 <p>For atomicity, <em>git apply</em> by default fails the whole patch and
 584 does not touch the working tree when some of the hunks
 585 do not apply.  This option makes it apply
 586 the parts of the patch that are applicable, and leave the
 587 rejected hunks in corresponding *.rej files.</p>
 588 </dd>
 589 <dt class="hdlist1">-z</dt>
 590 <dd>
 591 <p>When <code>--numstat</code> has been given, do not munge pathnames,
 592 but use a NUL-terminated machine-readable format.</p>
 593 <div class="paragraph">
 594 <p>Without this option, pathnames with "unusual" characters are quoted as
 595 explained for the configuration variable <code>core.quotePath</code> (see
 596 <a href="git-config.html">git-config(1)</a>).</p>
 597 </div>
 598 </dd>
 599 <dt class="hdlist1">-p&lt;n&gt;</dt>
 600 <dd>
 601 <p>Remove &lt;n&gt; leading path components (separated by slashes) from
 602 traditional diff paths. E.g., with <code>-p2</code>, a patch against
 603 <code>a/dir/file</code> will be applied directly to <code>file</code>. The default is
 604 1.</p>
 605 </dd>
 606 <dt class="hdlist1">-C&lt;n&gt;</dt>
 607 <dd>
 608 <p>Ensure at least &lt;n&gt; lines of surrounding context match before
 609 and after each change.  When fewer lines of surrounding
 610 context exist they all must match.  By default no context is
 611 ever ignored.</p>
 612 </dd>
 613 <dt class="hdlist1">--unidiff-zero</dt>
 614 <dd>
 615 <p>By default, <em>git apply</em> expects that the patch being
 616 applied is a unified diff with at least one line of context.
 617 This provides good safety measures, but breaks down when
 618 applying a diff generated with <code>--unified=0</code>. To bypass these
 619 checks use <code>--unidiff-zero</code>.</p>
 620 <div class="paragraph">
 621 <p>Note, for the reasons stated above, the usage of context-free patches is
 622 discouraged.</p>
 623 </div>
 624 </dd>
 625 <dt class="hdlist1">--apply</dt>
 626 <dd>
 627 <p>If you use any of the options marked "Turns off
 628 <em>apply</em>" above, <em>git apply</em> reads and outputs the
 629 requested information without actually applying the
 630 patch.  Give this flag after those flags to also apply
 631 the patch.</p>
 632 </dd>
 633 <dt class="hdlist1">--no-add</dt>
 634 <dd>
 635 <p>When applying a patch, ignore additions made by the
 636 patch.  This can be used to extract the common part between
 637 two files by first running <em>diff</em> on them and applying
 638 the result with this option, which would apply the
 639 deletion part but not the addition part.</p>
 640 </dd>
 641 <dt class="hdlist1">--allow-binary-replacement</dt>
 642 <dt class="hdlist1">--binary</dt>
 643 <dd>
 644 <p>Historically we did not allow binary patch application
 645 without an explicit permission from the user, and this
 646 flag was the way to do so.  Currently, we always allow binary
 647 patch application, so this is a no-op.</p>
 648 </dd>
 649 <dt class="hdlist1">--exclude=&lt;path-pattern&gt;</dt>
 650 <dd>
 651 <p>Don&#8217;t apply changes to files matching the given path pattern. This can
 652 be useful when importing patchsets, where you want to exclude certain
 653 files or directories.</p>
 654 </dd>
 655 <dt class="hdlist1">--include=&lt;path-pattern&gt;</dt>
 656 <dd>
 657 <p>Apply changes to files matching the given path pattern. This can
 658 be useful when importing patchsets, where you want to include certain
 659 files or directories.</p>
 660 <div class="paragraph">
 661 <p>When <code>--exclude</code> and <code>--include</code> patterns are used, they are examined in the
 662 order they appear on the command line, and the first match determines if a
 663 patch to each path is used.  A patch to a path that does not match any
 664 include/exclude pattern is used by default if there is no include pattern
 665 on the command line, and ignored if there is any include pattern.</p>
 666 </div>
 667 </dd>
 668 <dt class="hdlist1">--ignore-space-change</dt>
 669 <dt class="hdlist1">--ignore-whitespace</dt>
 670 <dd>
 671 <p>When applying a patch, ignore changes in whitespace in context
 672 lines if necessary.
 673 Context lines will preserve their whitespace, and they will not
 674 undergo whitespace fixing regardless of the value of the
 675 <code>--whitespace</code> option. New lines will still be fixed, though.</p>
 676 </dd>
 677 <dt class="hdlist1">--whitespace=&lt;action&gt;</dt>
 678 <dd>
 679 <p>When applying a patch, detect a new or modified line that has
 680 whitespace errors.  What are considered whitespace errors is
 681 controlled by <code>core.whitespace</code> configuration.  By default,
 682 trailing whitespaces (including lines that solely consist of
 683 whitespaces) and a space character that is immediately followed
 684 by a tab character inside the initial indent of the line are
 685 considered whitespace errors.</p>
 686 <div class="paragraph">
 687 <p>By default, the command outputs warning messages but applies the patch.
 688 When <code>git-apply</code> is used for statistics and not applying a
 689 patch, it defaults to <code>nowarn</code>.</p>
 690 </div>
 691 <div class="paragraph">
 692 <p>You can use different <code>&lt;action&gt;</code> values to control this
 693 behavior:</p>
 694 </div>
 695 <div class="ulist">
 696 <ul>
 697 <li>
 698 <p><code>nowarn</code> turns off the trailing whitespace warning.</p>
 699 </li>
 700 <li>
 701 <p><code>warn</code> outputs warnings for a few such errors, but applies the
 702 patch as-is (default).</p>
 703 </li>
 704 <li>
 705 <p><code>fix</code> outputs warnings for a few such errors, and applies the
 706 patch after fixing them (<code>strip</code> is a synonym&#8201;&#8212;&#8201;the tool
 707 used to consider only trailing whitespace characters as errors, and the
 708 fix involved <em>stripping</em> them, but modern Gits do more).</p>
 709 </li>
 710 <li>
 711 <p><code>error</code> outputs warnings for a few such errors, and refuses
 712 to apply the patch.</p>
 713 </li>
 714 <li>
 715 <p><code>error-all</code> is similar to <code>error</code> but shows all errors.</p>
 716 </li>
 717 </ul>
 718 </div>
 719 </dd>
 720 <dt class="hdlist1">--inaccurate-eof</dt>
 721 <dd>
 722 <p>Under certain circumstances, some versions of <em>diff</em> do not correctly
 723 detect a missing new-line at the end of the file. As a result, patches
 724 created by such <em>diff</em> programs do not record incomplete lines
 725 correctly. This option adds support for applying such patches by
 726 working around this bug.</p>
 727 </dd>
 728 <dt class="hdlist1">-v</dt>
 729 <dt class="hdlist1">--verbose</dt>
 730 <dd>
 731 <p>Report progress to stderr. By default, only a message about the
 732 current patch being applied will be printed. This option will cause
 733 additional information to be reported.</p>
 734 </dd>
 735 <dt class="hdlist1">-q</dt>
 736 <dt class="hdlist1">--quiet</dt>
 737 <dd>
 738 <p>Suppress stderr output. Messages about patch status and progress
 739 will not be printed.</p>
 740 </dd>
 741 <dt class="hdlist1">--recount</dt>
 742 <dd>
 743 <p>Do not trust the line counts in the hunk headers, but infer them
 744 by inspecting the patch (e.g. after editing the patch without
 745 adjusting the hunk headers appropriately).</p>
 746 </dd>
 747 <dt class="hdlist1">--directory=&lt;root&gt;</dt>
 748 <dd>
 749 <p>Prepend &lt;root&gt; to all filenames.  If a "-p" argument was also passed,
 750 it is applied before prepending the new root.</p>
 751 <div class="paragraph">
 752 <p>For example, a patch that talks about updating <code>a/git-gui.sh</code> to <code>b/git-gui.sh</code>
 753 can be applied to the file in the working tree <code>modules/git-gui/git-gui.sh</code> by
 754 running <code>git apply --directory=modules/git-gui</code>.</p>
 755 </div>
 756 </dd>
 757 <dt class="hdlist1">--unsafe-paths</dt>
 758 <dd>
 759 <p>By default, a patch that affects outside the working area
 760 (either a Git controlled working tree, or the current working
 761 directory when "git apply" is used as a replacement of GNU
 762 patch) is rejected as a mistake (or a mischief).</p>
 763 <div class="paragraph">
 764 <p>When <code>git apply</code> is used as a "better GNU patch", the user can pass
 765 the <code>--unsafe-paths</code> option to override this safety check.  This option
 766 has no effect when <code>--index</code> or <code>--cached</code> is in use.</p>
 767 </div>
 768 </dd>
 769 <dt class="hdlist1">--allow-empty</dt>
 770 <dd>
 771 <p>Don&#8217;t return an error for patches containing no diff. This includes
 772 empty patches and patches with commit text only.</p>
 773 </dd>
 774 </dl>
 775 </div>
 776 </div>
 777 </div>
 778 <div class="sect1">
 779 <h2 id="_configuration">CONFIGURATION</h2>
 780 <div class="sectionbody">
 781 <div class="paragraph">
 782 <p>Everything below this line in this section is selectively included
 783 from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
 784 as what&#8217;s found there:</p>
 785 </div>
 786 <div class="dlist">
 787 <dl>
 788 <dt class="hdlist1">apply.ignoreWhitespace</dt>
 789 <dd>
 790 <p>When set to <em>change</em>, tells <em>git apply</em> to ignore changes in
 791 whitespace, in the same way as the <code>--ignore-space-change</code>
 792 option.
 793 When set to one of: no, none, never, false, it tells <em>git apply</em> to
 794 respect all whitespace differences.
 795 See <a href="git-apply.html">git-apply(1)</a>.</p>
 796 </dd>
 797 <dt class="hdlist1">apply.whitespace</dt>
 798 <dd>
 799 <p>Tells <em>git apply</em> how to handle whitespace, in the same way
 800 as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.</p>
 801 </dd>
 802 </dl>
 803 </div>
 804 </div>
 805 </div>
 806 <div class="sect1">
 807 <h2 id="_submodules">SUBMODULES</h2>
 808 <div class="sectionbody">
 809 <div class="paragraph">
 810 <p>If the patch contains any changes to submodules then <em>git apply</em>
 811 treats these changes as follows.</p>
 812 </div>
 813 <div class="paragraph">
 814 <p>If <code>--index</code> is specified (explicitly or implicitly), then the submodule
 815 commits must match the index exactly for the patch to apply.  If any
 816 of the submodules are checked-out, then these check-outs are completely
 817 ignored, i.e., they are not required to be up to date or clean and they
 818 are not updated.</p>
 819 </div>
 820 <div class="paragraph">
 821 <p>If <code>--index</code> is not specified, then the submodule commits in the patch
 822 are ignored and only the absence or presence of the corresponding
 823 subdirectory is checked and (if possible) updated.</p>
 824 </div>
 825 </div>
 826 </div>
 827 <div class="sect1">
 828 <h2 id="_see_also">SEE ALSO</h2>
 829 <div class="sectionbody">
 830 <div class="paragraph">
 831 <p><a href="git-am.html">git-am(1)</a>.</p>
 832 </div>
 833 </div>
 834 </div>
 835 <div class="sect1">
 836 <h2 id="_git">GIT</h2>
 837 <div class="sectionbody">
 838 <div class="paragraph">
 839 <p>Part of the <a href="git.html">git(1)</a> suite</p>
 840 </div>
 841 </div>
 842 </div>
 843 </div>
 844 <div id="footer">
 845 <div id="footer-text">
 846 Last updated 2024-09-16 14:32:02 -0700
 847 </div>
 848 </div>
 849 </body>
 850 </html>