|
<!DOCTYPE html> |
|
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
|
<head> |
|
<meta charset="UTF-8"/> |
|
<meta http-equiv="X-UA-Compatible" content="IE=edge"/> |
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> |
|
<meta name="generator" content="Asciidoctor 2.0.17"/> |
|
<title>git-apply(1)</title> |
|
<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"/> |
|
<style> |
|
|
|
|
|
|
|
html{font-family:sans-serif;-webkit-text-size-adjust:100%} |
|
a{background:none} |
|
a:focus{outline:thin dotted} |
|
a:active,a:hover{outline:0} |
|
h1{font-size:2em;margin:.67em 0} |
|
b,strong{font-weight:bold} |
|
abbr{font-size:.9em} |
|
abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none} |
|
dfn{font-style:italic} |
|
hr{height:0} |
|
mark{background:#ff0;color:#000} |
|
code,kbd,pre,samp{font-family:monospace;font-size:1em} |
|
pre{white-space:pre-wrap} |
|
q{quotes:"\201C" "\201D" "\2018" "\2019"} |
|
small{font-size:80%} |
|
sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} |
|
sup{top:-.5em} |
|
sub{bottom:-.25em} |
|
img{border:0} |
|
svg:not(:root){overflow:hidden} |
|
figure{margin:0} |
|
audio,video{display:inline-block} |
|
audio:not([controls]){display:none;height:0} |
|
fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} |
|
legend{border:0;padding:0} |
|
button,input,select,textarea{font-family:inherit;font-size:100%;margin:0} |
|
button,input{line-height:normal} |
|
button,select{text-transform:none} |
|
button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer} |
|
button[disabled],html input[disabled]{cursor:default} |
|
input[type=checkbox],input[type=radio]{padding:0} |
|
button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} |
|
textarea{overflow:auto;vertical-align:top} |
|
table{border-collapse:collapse;border-spacing:0} |
|
*,::before,::after{box-sizing:border-box} |
|
html,body{font-size:100%} |
|
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} |
|
a:hover{cursor:pointer} |
|
img,object,embed{max-width:100%;height:auto} |
|
object,embed{height:100%} |
|
img{-ms-interpolation-mode:bicubic} |
|
.left{float:left!important} |
|
.right{float:right!important} |
|
.text-left{text-align:left!important} |
|
.text-right{text-align:right!important} |
|
.text-center{text-align:center!important} |
|
.text-justify{text-align:justify!important} |
|
.hide{display:none} |
|
img,object,svg{display:inline-block;vertical-align:middle} |
|
textarea{height:auto;min-height:50px} |
|
select{width:100%} |
|
.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} |
|
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} |
|
a{color:#2156a5;text-decoration:underline;line-height:inherit} |
|
a:hover,a:focus{color:#1d4b8f} |
|
a img{border:0} |
|
p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility} |
|
p aside{font-size:.875em;line-height:1.35;font-style:italic} |
|
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} |
|
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} |
|
h1{font-size:2.125em} |
|
h2{font-size:1.6875em} |
|
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em} |
|
h4,h5{font-size:1.125em} |
|
h6{font-size:1em} |
|
hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em} |
|
em,i{font-style:italic;line-height:inherit} |
|
strong,b{font-weight:bold;line-height:inherit} |
|
small{font-size:60%;line-height:inherit} |
|
code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)} |
|
ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit} |
|
ul,ol{margin-left:1.5em} |
|
ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0} |
|
ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit} |
|
ul.square{list-style-type:square} |
|
ul.circle{list-style-type:circle} |
|
ul.disc{list-style-type:disc} |
|
ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0} |
|
dl dt{margin-bottom:.3125em;font-weight:bold} |
|
dl dd{margin-bottom:1.25em} |
|
blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd} |
|
blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)} |
|
@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2} |
|
h1{font-size:2.75em} |
|
h2{font-size:2.3125em} |
|
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em} |
|
h4{font-size:1.4375em}} |
|
table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal} |
|
table thead,table tfoot{background:#f7f8f7} |
|
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} |
|
table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)} |
|
table tr.even,table tr.alt{background:#f8f8f7} |
|
table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6} |
|
h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em} |
|
h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400} |
|
.center{margin-left:auto;margin-right:auto} |
|
.stretch{width:100%} |
|
.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table} |
|
.clearfix::after,.float-group::after{clear:both} |
|
:not(pre).nobreak{word-wrap:normal} |
|
:not(pre).nowrap{white-space:nowrap} |
|
:not(pre).pre-wrap{white-space:pre-wrap} |
|
: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} |
|
pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed} |
|
pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit} |
|
pre>code{display:block} |
|
pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal} |
|
em em{font-style:normal} |
|
strong strong{font-weight:400} |
|
.keyseq{color:rgba(51,51,51,.8)} |
|
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} |
|
.keyseq kbd:first-child{margin-left:0} |
|
.keyseq kbd:last-child{margin-right:0} |
|
.menuseq,.menuref{color:#000} |
|
.menuseq b:not(.caret),.menuref{font-weight:inherit} |
|
.menuseq{word-spacing:-.02em} |
|
.menuseq b.caret{font-size:1.25em;line-height:.8} |
|
.menuseq i.caret{font-weight:bold;text-align:center;width:.45em} |
|
b.button::before,b.button::after{position:relative;top:-1px;font-weight:400} |
|
b.button::before{content:"[";padding:0 3px 0 2px} |
|
b.button::after{content:"]";padding:0 2px 0 3px} |
|
p a>code:hover{color:rgba(0,0,0,.9)} |
|
#header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em} |
|
#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table} |
|
#header::after,#content::after,#footnotes::after,#footer::after{clear:both} |
|
#content{margin-top:1.25em} |
|
#content::before{content:none} |
|
#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0} |
|
#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf} |
|
#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px} |
|
#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} |
|
#header .details span:first-child{margin-left:-.125em} |
|
#header .details span.email a{color:rgba(0,0,0,.85)} |
|
#header .details br{display:none} |
|
#header .details br+span::before{content:"\00a0\2013\00a0"} |
|
#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)} |
|
#header .details br+span#revremark::before{content:"\00a0|\00a0"} |
|
#header #revnumber{text-transform:capitalize} |
|
#header #revnumber::after{content:"\00a0"} |
|
#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} |
|
#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em} |
|
#toc>ul{margin-left:.125em} |
|
#toc ul.sectlevel0>li>a{font-style:italic} |
|
#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0} |
|
#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none} |
|
#toc li{line-height:1.3334;margin-top:.3334em} |
|
#toc a{text-decoration:none} |
|
#toc a:active{text-decoration:underline} |
|
#toctitle{color:#7a2518;font-size:1.2em} |
|
@media screen and (min-width:768px){#toctitle{font-size:1.375em} |
|
body.toc2{padding-left:15em;padding-right:0} |
|
#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} |
|
#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em} |
|
#toc.toc2>ul{font-size:.9em;margin-bottom:0} |
|
#toc.toc2 ul ul{margin-left:0;padding-left:1em} |
|
#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em} |
|
body.toc2.toc-right{padding-left:0;padding-right:15em} |
|
body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}} |
|
@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0} |
|
#toc.toc2{width:20em} |
|
#toc.toc2 #toctitle{font-size:1.375em} |
|
#toc.toc2>ul{font-size:.95em} |
|
#toc.toc2 ul ul{padding-left:1.25em} |
|
body.toc2.toc-right{padding-left:0;padding-right:20em}} |
|
#content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px} |
|
#content #toc>:first-child{margin-top:0} |
|
#content #toc>:last-child{margin-bottom:0} |
|
#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em} |
|
#footer-text{color:hsla(0,0%,100%,.8);line-height:1.44} |
|
#content{margin-bottom:.625em} |
|
.sect1{padding-bottom:.625em} |
|
@media screen and (min-width:768px){#content{margin-bottom:1.25em} |
|
.sect1{padding-bottom:1.25em}} |
|
.sect1:last-child{padding-bottom:0} |
|
.sect1+.sect1{border-top:1px solid #e7e7e9} |
|
#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} |
|
#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} |
|
#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} |
|
#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} |
|
#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} |
|
details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em} |
|
details{margin-left:1.25rem} |
|
details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent} |
|
details>summary::-webkit-details-marker{display:none} |
|
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%)} |
|
details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)} |
|
details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem} |
|
.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} |
|
table.tableblock.fit-content>caption.title{white-space:nowrap;width:0} |
|
.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)} |
|
.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%} |
|
.admonitionblock>table td.icon{text-align:center;width:80px} |
|
.admonitionblock>table td.icon img{max-width:none} |
|
.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase} |
|
.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} |
|
.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0} |
|
.exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px} |
|
.exampleblock>.content>:first-child{margin-top:0} |
|
.exampleblock>.content>:last-child{margin-bottom:0} |
|
.sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px} |
|
.sidebarblock>:first-child{margin-top:0} |
|
.sidebarblock>:last-child{margin-bottom:0} |
|
.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center} |
|
.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>: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} |
|
.literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em} |
|
@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}} |
|
@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}} |
|
.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8} |
|
.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)} |
|
.listingblock>.content{position:relative} |
|
.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} |
|
.listingblock:hover code[data-lang]::before{display:block} |
|
.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5} |
|
.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"} |
|
.listingblock pre.highlightjs{padding:0} |
|
.listingblock pre.highlightjs>code{padding:1em;border-radius:4px} |
|
.listingblock pre.prettyprint{border-width:0} |
|
.prettyprint{background:#f7f7f8} |
|
pre.prettyprint .linenums{line-height:1.45;margin-left:2em} |
|
pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0} |
|
pre.prettyprint li code[data-lang]::before{opacity:1} |
|
pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none} |
|
table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none} |
|
table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal} |
|
table.linenotable td.code{padding-left:.75em} |
|
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} |
|
pre.pygments span.linenos{display:inline-block;margin-right:.75em} |
|
.quoteblock{margin:0 1em 1.25em 1.5em;display:table} |
|
.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em} |
|
.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} |
|
.quoteblock blockquote{margin:0;padding:0;border:0} |
|
.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)} |
|
.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0} |
|
.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right} |
|
.verseblock{margin:0 1em 1.25em} |
|
.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} |
|
.verseblock pre strong{font-weight:400} |
|
.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex} |
|
.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic} |
|
.quoteblock .attribution br,.verseblock .attribution br{display:none} |
|
.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)} |
|
.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none} |
|
.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} |
|
.quoteblock.abstract{margin:0 1em 1.25em;display:block} |
|
.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center} |
|
.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf} |
|
.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0} |
|
.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem} |
|
.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0} |
|
p.tableblock:last-child{margin-bottom:0} |
|
td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere} |
|
td.tableblock>.content>:last-child{margin-bottom:-1.25em} |
|
table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede} |
|
table.grid-all>*>tr>*{border-width:1px} |
|
table.grid-cols>*>tr>*{border-width:0 1px} |
|
table.grid-rows>*>tr>*{border-width:1px 0} |
|
table.frame-all{border-width:1px} |
|
table.frame-ends{border-width:1px 0} |
|
table.frame-sides{border-width:0 1px} |
|
table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0} |
|
table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0} |
|
table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0} |
|
table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0} |
|
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} |
|
th.halign-left,td.halign-left{text-align:left} |
|
th.halign-right,td.halign-right{text-align:right} |
|
th.halign-center,td.halign-center{text-align:center} |
|
th.valign-top,td.valign-top{vertical-align:top} |
|
th.valign-bottom,td.valign-bottom{vertical-align:bottom} |
|
th.valign-middle,td.valign-middle{vertical-align:middle} |
|
table thead th,table tfoot th{font-weight:bold} |
|
tbody tr th{background:#f7f8f7} |
|
tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold} |
|
p.tableblock>code:only-child{background:none;padding:0} |
|
p.tableblock{font-size:1em} |
|
ol{margin-left:1.75em} |
|
ul li ol{margin-left:1.5em} |
|
dl dd{margin-left:1.125em} |
|
dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0} |
|
li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em} |
|
ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none} |
|
ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em} |
|
ul.unstyled,ol.unstyled{margin-left:0} |
|
li>p:empty:only-child::before{content:"";display:inline-block} |
|
ul.checklist>li>p:first-child{margin-left:-1em} |
|
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} |
|
ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em} |
|
ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em} |
|
ul.inline>li{margin-left:1.25em} |
|
.unstyled dl dt{font-weight:400;font-style:normal} |
|
ol.arabic{list-style-type:decimal} |
|
ol.decimal{list-style-type:decimal-leading-zero} |
|
ol.loweralpha{list-style-type:lower-alpha} |
|
ol.upperalpha{list-style-type:upper-alpha} |
|
ol.lowerroman{list-style-type:lower-roman} |
|
ol.upperroman{list-style-type:upper-roman} |
|
ol.lowergreek{list-style-type:lower-greek} |
|
.hdlist>table,.colist>table{border:0;background:none} |
|
.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none} |
|
td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em} |
|
td.hdlist1{font-weight:bold;padding-bottom:1.25em} |
|
td.hdlist2{word-wrap:anywhere} |
|
.literalblock+.colist,.listingblock+.colist{margin-top:-.5em} |
|
.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top} |
|
.colist td:not([class]):first-child img{max-width:none} |
|
.colist td:not([class]):last-child{padding:.25em 0} |
|
.thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd} |
|
.imageblock.left{margin:.25em .625em 1.25em 0} |
|
.imageblock.right{margin:.25em 0 1.25em .625em} |
|
.imageblock>.title{margin-bottom:0} |
|
.imageblock.thumb,.imageblock.th{border-width:6px} |
|
.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em} |
|
.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0} |
|
.image.left{margin-right:.625em} |
|
.image.right{margin-left:.625em} |
|
a.image{text-decoration:none;display:inline-block} |
|
a.image object{pointer-events:none} |
|
sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super} |
|
sup.footnote a,sup.footnoteref a{text-decoration:none} |
|
sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline} |
|
#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em} |
|
#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0} |
|
#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em} |
|
#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em} |
|
#footnotes .footnote:last-of-type{margin-bottom:0} |
|
#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0} |
|
div.unbreakable{page-break-inside:avoid} |
|
.big{font-size:larger} |
|
.small{font-size:smaller} |
|
.underline{text-decoration:underline} |
|
.overline{text-decoration:overline} |
|
.line-through{text-decoration:line-through} |
|
.aqua{color:#00bfbf} |
|
.aqua-background{background:#00fafa} |
|
.black{color:#000} |
|
.black-background{background:#000} |
|
.blue{color:#0000bf} |
|
.blue-background{background:#0000fa} |
|
.fuchsia{color:#bf00bf} |
|
.fuchsia-background{background:#fa00fa} |
|
.gray{color:#606060} |
|
.gray-background{background:#7d7d7d} |
|
.green{color:#006000} |
|
.green-background{background:#007d00} |
|
.lime{color:#00bf00} |
|
.lime-background{background:#00fa00} |
|
.maroon{color:#600000} |
|
.maroon-background{background:#7d0000} |
|
.navy{color:#000060} |
|
.navy-background{background:#00007d} |
|
.olive{color:#606000} |
|
.olive-background{background:#7d7d00} |
|
.purple{color:#600060} |
|
.purple-background{background:#7d007d} |
|
.red{color:#bf0000} |
|
.red-background{background:#fa0000} |
|
.silver{color:#909090} |
|
.silver-background{background:#bcbcbc} |
|
.teal{color:#006060} |
|
.teal-background{background:#007d7d} |
|
.white{color:#bfbfbf} |
|
.white-background{background:#fafafa} |
|
.yellow{color:#bfbf00} |
|
.yellow-background{background:#fafa00} |
|
span.icon>.fa{cursor:default} |
|
a span.icon>.fa{cursor:inherit} |
|
.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default} |
|
.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c} |
|
.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111} |
|
.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900} |
|
.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400} |
|
.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000} |
|
.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} |
|
.conum[data-value] *{color:#fff!important} |
|
.conum[data-value]+b{display:none} |
|
.conum[data-value]::after{content:attr(data-value)} |
|
pre .conum[data-value]{position:relative;top:-.125em} |
|
b.conum *{color:inherit!important} |
|
.conum:not([data-value]):empty{display:none} |
|
dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility} |
|
h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em} |
|
p strong,td.content strong,div.footnote strong{letter-spacing:-.005em} |
|
p,blockquote,dt,td.content,span.alt,summary{font-size:1.0625rem} |
|
p{margin-bottom:1.25rem} |
|
.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em} |
|
.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc} |
|
.print-only{display:none!important} |
|
@page{margin:1.25cm .75cm} |
|
@media print{*{box-shadow:none!important;text-shadow:none!important} |
|
html{font-size:80%} |
|
a{color:inherit!important;text-decoration:underline!important} |
|
a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important} |
|
a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em} |
|
abbr[title]{border-bottom:1px dotted} |
|
abbr[title]::after{content:" (" attr(title) ")"} |
|
pre,blockquote,tr,img,object,svg{page-break-inside:avoid} |
|
thead{display:table-header-group} |
|
svg{max-width:100%} |
|
p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3} |
|
h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid} |
|
#header,#content,#footnotes,#footer{max-width:none} |
|
#toc,.sidebarblock,.exampleblock>.content{background:none!important} |
|
#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important} |
|
body.book #header{text-align:center} |
|
body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em} |
|
body.book #header .details{border:0!important;display:block;padding:0!important} |
|
body.book #header .details span:first-child{margin-left:0!important} |
|
body.book #header .details br{display:block} |
|
body.book #header .details br+span::before{content:none!important} |
|
body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important} |
|
body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always} |
|
.listingblock code[data-lang]::before{display:block} |
|
#footer{padding:0 .9375em} |
|
.hide-on-print{display:none!important} |
|
.print-only{display:block!important} |
|
.hide-for-print{display:none!important} |
|
.show-for-print{display:inherit!important}} |
|
@media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem} |
|
.sect1{padding:0!important} |
|
.sect1+.sect1{border:0} |
|
#footer{background:none} |
|
#footer-text{color:rgba(0,0,0,.6);font-size:.9em}} |
|
@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}} |
|
</style> |
|
</head> |
|
<body class="manpage"> |
|
<div id="header"> |
|
<h1>git-apply(1) Manual Page</h1> |
|
<h2 id="_name">NAME</h2> |
|
<div class="sectionbody"> |
|
<p>git-apply - Apply a patch to files and/or to the index</p> |
|
</div> |
|
</div> |
|
<div id="content"> |
|
<div class="sect1"> |
|
<h2 id="_synopsis">SYNOPSIS</h2> |
|
<div class="sectionbody"> |
|
<div class="verseblock"> |
|
<pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way] |
|
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] |
|
[--allow-binary-replacement | --binary] [--reject] [-z] |
|
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached] |
|
[--ignore-space-change | --ignore-whitespace] |
|
[--whitespace=(nowarn|warn|fix|error|error-all)] |
|
[--exclude=<path>] [--include=<path>] [--directory=<root>] |
|
[--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>…​]</pre> |
|
</div> |
|
</div> |
|
</div> |
|
<div class="sect1"> |
|
<h2 id="_description">DESCRIPTION</h2> |
|
<div class="sectionbody"> |
|
<div class="paragraph"> |
|
<p>Reads the supplied diff output (i.e. "a patch") and applies it to files. |
|
When running from a subdirectory in a repository, patched paths |
|
outside the directory are ignored. |
|
With the <code>--index</code> option the patch is also applied to the index, and |
|
with the <code>--cached</code> option the patch is only applied to the index. |
|
Without these options, the command applies the patch only to files, |
|
and does not require them to be in a Git repository.</p> |
|
</div> |
|
<div class="paragraph"> |
|
<p>This command applies the patch but does not create a commit. Use |
|
<a href="git-am.html">git-am(1)</a> to create commits from patches generated by |
|
<a href="git-format-patch.html">git-format-patch(1)</a> and/or received by email.</p> |
|
</div> |
|
</div> |
|
</div> |
|
<div class="sect1"> |
|
<h2 id="_options">OPTIONS</h2> |
|
<div class="sectionbody"> |
|
<div class="dlist"> |
|
<dl> |
|
<dt class="hdlist1"><patch>…​</dt> |
|
<dd> |
|
<p>The files to read the patch from. <em>-</em> can be used to read |
|
from the standard input.</p> |
|
</dd> |
|
<dt class="hdlist1">--stat</dt> |
|
<dd> |
|
<p>Instead of applying the patch, output diffstat for the |
|
input. Turns off "apply".</p> |
|
</dd> |
|
<dt class="hdlist1">--numstat</dt> |
|
<dd> |
|
<p>Similar to <code>--stat</code>, but shows the number of added and |
|
deleted lines in decimal notation and the pathname without |
|
abbreviation, to make it more machine friendly. For |
|
binary files, outputs two <code>-</code> instead of saying |
|
<code>0 0</code>. Turns off "apply".</p> |
|
</dd> |
|
<dt class="hdlist1">--summary</dt> |
|
<dd> |
|
<p>Instead of applying the patch, output a condensed |
|
summary of information obtained from git diff extended |
|
headers, such as creations, renames and mode changes. |
|
Turns off "apply".</p> |
|
</dd> |
|
<dt class="hdlist1">--check</dt> |
|
<dd> |
|
<p>Instead of applying the patch, see if the patch is |
|
applicable to the current working tree and/or the index |
|
file and detects errors. Turns off "apply".</p> |
|
</dd> |
|
<dt class="hdlist1">--index</dt> |
|
<dd> |
|
<p>Apply the patch to both the index and the working tree (or |
|
merely check that it would apply cleanly to both if <code>--check</code> is |
|
in effect). Note that <code>--index</code> expects index entries and |
|
working tree copies for relevant paths to be identical (their |
|
contents and metadata such as file mode must match), and will |
|
raise an error if they are not, even if the patch would apply |
|
cleanly to both the index and the working tree in isolation.</p> |
|
</dd> |
|
<dt class="hdlist1">--cached</dt> |
|
<dd> |
|
<p>Apply the patch to just the index, without touching the working |
|
tree. If <code>--check</code> is in effect, merely check that it would |
|
apply cleanly to the index entry.</p> |
|
</dd> |
|
<dt class="hdlist1">--intent-to-add</dt> |
|
<dd> |
|
<p>When applying the patch only to the working tree, mark new |
|
files to be added to the index later (see <code>--intent-to-add</code> |
|
option in <a href="git-add.html">git-add(1)</a>). This option is ignored unless |
|
running in a Git repository and <code>--index</code> is not specified. |
|
Note that <code>--index</code> could be implied by other options such |
|
as <code>--cached</code> or <code>--3way</code>.</p> |
|
</dd> |
|
<dt class="hdlist1">-3</dt> |
|
<dt class="hdlist1">--3way</dt> |
|
<dd> |
|
<p>Attempt 3-way merge if the patch records the identity of blobs it is supposed |
|
to apply to and we have those blobs available locally, possibly leaving the |
|
conflict markers in the files in the working tree for the user to |
|
resolve. This option implies the <code>--index</code> option unless the |
|
<code>--cached</code> option is used, and is incompatible with the <code>--reject</code> option. |
|
When used with the <code>--cached</code> option, any conflicts are left at higher stages |
|
in the cache.</p> |
|
</dd> |
|
<dt class="hdlist1">--build-fake-ancestor=<file></dt> |
|
<dd> |
|
<p>Newer <em>git diff</em> output has embedded <em>index information</em> |
|
for each blob to help identify the original version that |
|
the patch applies to. When this flag is given, and if |
|
the original versions of the blobs are available locally, |
|
builds a temporary index containing those blobs.</p> |
|
<div class="paragraph"> |
|
<p>When a pure mode change is encountered (which has no index information), |
|
the information is read from the current index instead.</p> |
|
</div> |
|
</dd> |
|
<dt class="hdlist1">-R</dt> |
|
<dt class="hdlist1">--reverse</dt> |
|
<dd> |
|
<p>Apply the patch in reverse.</p> |
|
</dd> |
|
<dt class="hdlist1">--reject</dt> |
|
<dd> |
|
<p>For atomicity, <em>git apply</em> by default fails the whole patch and |
|
does not touch the working tree when some of the hunks |
|
do not apply. This option makes it apply |
|
the parts of the patch that are applicable, and leave the |
|
rejected hunks in corresponding *.rej files.</p> |
|
</dd> |
|
<dt class="hdlist1">-z</dt> |
|
<dd> |
|
<p>When <code>--numstat</code> has been given, do not munge pathnames, |
|
but use a NUL-terminated machine-readable format.</p> |
|
<div class="paragraph"> |
|
<p>Without this option, pathnames with "unusual" characters are quoted as |
|
explained for the configuration variable <code>core.quotePath</code> (see |
|
<a href="git-config.html">git-config(1)</a>).</p> |
|
</div> |
|
</dd> |
|
<dt class="hdlist1">-p<n></dt> |
|
<dd> |
|
<p>Remove <n> leading path components (separated by slashes) from |
|
traditional diff paths. E.g., with <code>-p2</code>, a patch against |
|
<code>a/dir/file</code> will be applied directly to <code>file</code>. The default is |
|
1.</p> |
|
</dd> |
|
<dt class="hdlist1">-C<n></dt> |
|
<dd> |
|
<p>Ensure at least <n> lines of surrounding context match before |
|
and after each change. When fewer lines of surrounding |
|
context exist they all must match. By default no context is |
|
ever ignored.</p> |
|
</dd> |
|
<dt class="hdlist1">--unidiff-zero</dt> |
|
<dd> |
|
<p>By default, <em>git apply</em> expects that the patch being |
|
applied is a unified diff with at least one line of context. |
|
This provides good safety measures, but breaks down when |
|
applying a diff generated with <code>--unified=0</code>. To bypass these |
|
checks use <code>--unidiff-zero</code>.</p> |
|
<div class="paragraph"> |
|
<p>Note, for the reasons stated above usage of context-free patches is |
|
discouraged.</p> |
|
</div> |
|
</dd> |
|
<dt class="hdlist1">--apply</dt> |
|
<dd> |
|
<p>If you use any of the options marked "Turns off |
|
<em>apply</em>" above, <em>git apply</em> reads and outputs the |
|
requested information without actually applying the |
|
patch. Give this flag after those flags to also apply |
|
the patch.</p> |
|
</dd> |
|
<dt class="hdlist1">--no-add</dt> |
|
<dd> |
|
<p>When applying a patch, ignore additions made by the |
|
patch. This can be used to extract the common part between |
|
two files by first running <em>diff</em> on them and applying |
|
the result with this option, which would apply the |
|
deletion part but not the addition part.</p> |
|
</dd> |
|
<dt class="hdlist1">--allow-binary-replacement</dt> |
|
<dt class="hdlist1">--binary</dt> |
|
<dd> |
|
<p>Historically we did not allow binary patch applied |
|
without an explicit permission from the user, and this |
|
flag was the way to do so. Currently we always allow binary |
|
patch application, so this is a no-op.</p> |
|
</dd> |
|
<dt class="hdlist1">--exclude=<path-pattern></dt> |
|
<dd> |
|
<p>Don’t apply changes to files matching the given path pattern. This can |
|
be useful when importing patchsets, where you want to exclude certain |
|
files or directories.</p> |
|
</dd> |
|
<dt class="hdlist1">--include=<path-pattern></dt> |
|
<dd> |
|
<p>Apply changes to files matching the given path pattern. This can |
|
be useful when importing patchsets, where you want to include certain |
|
files or directories.</p> |
|
<div class="paragraph"> |
|
<p>When <code>--exclude</code> and <code>--include</code> patterns are used, they are examined in the |
|
order they appear on the command line, and the first match determines if a |
|
patch to each path is used. A patch to a path that does not match any |
|
include/exclude pattern is used by default if there is no include pattern |
|
on the command line, and ignored if there is any include pattern.</p> |
|
</div> |
|
</dd> |
|
<dt class="hdlist1">--ignore-space-change</dt> |
|
<dt class="hdlist1">--ignore-whitespace</dt> |
|
<dd> |
|
<p>When applying a patch, ignore changes in whitespace in context |
|
lines if necessary. |
|
Context lines will preserve their whitespace, and they will not |
|
undergo whitespace fixing regardless of the value of the |
|
<code>--whitespace</code> option. New lines will still be fixed, though.</p> |
|
</dd> |
|
<dt class="hdlist1">--whitespace=<action></dt> |
|
<dd> |
|
<p>When applying a patch, detect a new or modified line that has |
|
whitespace errors. What are considered whitespace errors is |
|
controlled by <code>core.whitespace</code> configuration. By default, |
|
trailing whitespaces (including lines that solely consist of |
|
whitespaces) and a space character that is immediately followed |
|
by a tab character inside the initial indent of the line are |
|
considered whitespace errors.</p> |
|
<div class="paragraph"> |
|
<p>By default, the command outputs warning messages but applies the patch. |
|
When <code>git-apply</code> is used for statistics and not applying a |
|
patch, it defaults to <code>nowarn</code>.</p> |
|
</div> |
|
<div class="paragraph"> |
|
<p>You can use different <code><action></code> values to control this |
|
behavior:</p> |
|
</div> |
|
<div class="ulist"> |
|
<ul> |
|
<li> |
|
<p><code>nowarn</code> turns off the trailing whitespace warning.</p> |
|
</li> |
|
<li> |
|
<p><code>warn</code> outputs warnings for a few such errors, but applies the |
|
patch as-is (default).</p> |
|
</li> |
|
<li> |
|
<p><code>fix</code> outputs warnings for a few such errors, and applies the |
|
patch after fixing them (<code>strip</code> is a synonym — the tool |
|
used to consider only trailing whitespace characters as errors, and the |
|
fix involved <em>stripping</em> them, but modern Gits do more).</p> |
|
</li> |
|
<li> |
|
<p><code>error</code> outputs warnings for a few such errors, and refuses |
|
to apply the patch.</p> |
|
</li> |
|
<li> |
|
<p><code>error-all</code> is similar to <code>error</code> but shows all errors.</p> |
|
</li> |
|
</ul> |
|
</div> |
|
</dd> |
|
<dt class="hdlist1">--inaccurate-eof</dt> |
|
<dd> |
|
<p>Under certain circumstances, some versions of <em>diff</em> do not correctly |
|
detect a missing new-line at the end of the file. As a result, patches |
|
created by such <em>diff</em> programs do not record incomplete lines |
|
correctly. This option adds support for applying such patches by |
|
working around this bug.</p> |
|
</dd> |
|
<dt class="hdlist1">-v</dt> |
|
<dt class="hdlist1">--verbose</dt> |
|
<dd> |
|
<p>Report progress to stderr. By default, only a message about the |
|
current patch being applied will be printed. This option will cause |
|
additional information to be reported.</p> |
|
</dd> |
|
<dt class="hdlist1">-q</dt> |
|
<dt class="hdlist1">--quiet</dt> |
|
<dd> |
|
<p>Suppress stderr output. Messages about patch status and progress |
|
will not be printed.</p> |
|
</dd> |
|
<dt class="hdlist1">--recount</dt> |
|
<dd> |
|
<p>Do not trust the line counts in the hunk headers, but infer them |
|
by inspecting the patch (e.g. after editing the patch without |
|
adjusting the hunk headers appropriately).</p> |
|
</dd> |
|
<dt class="hdlist1">--directory=<root></dt> |
|
<dd> |
|
<p>Prepend <root> to all filenames. If a "-p" argument was also passed, |
|
it is applied before prepending the new root.</p> |
|
<div class="paragraph"> |
|
<p>For example, a patch that talks about updating <code>a/git-gui.sh</code> to <code>b/git-gui.sh</code> |
|
can be applied to the file in the working tree <code>modules/git-gui/git-gui.sh</code> by |
|
running <code>git apply --directory=modules/git-gui</code>.</p> |
|
</div> |
|
</dd> |
|
<dt class="hdlist1">--unsafe-paths</dt> |
|
<dd> |
|
<p>By default, a patch that affects outside the working area |
|
(either a Git controlled working tree, or the current working |
|
directory when "git apply" is used as a replacement of GNU |
|
patch) is rejected as a mistake (or a mischief).</p> |
|
<div class="paragraph"> |
|
<p>When <code>git apply</code> is used as a "better GNU patch", the user can pass |
|
the <code>--unsafe-paths</code> option to override this safety check. This option |
|
has no effect when <code>--index</code> or <code>--cached</code> is in use.</p> |
|
</div> |
|
</dd> |
|
<dt class="hdlist1">--allow-empty</dt> |
|
<dd> |
|
<p>Don’t return error for patches containing no diff. This includes |
|
empty patches and patches with commit text only.</p> |
|
</dd> |
|
</dl> |
|
</div> |
|
</div> |
|
</div> |
|
<div class="sect1"> |
|
<h2 id="_configuration">CONFIGURATION</h2> |
|
<div class="sectionbody"> |
|
<div class="paragraph"> |
|
<p>Everything below this line in this section is selectively included |
|
from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same |
|
as what’s found there:</p> |
|
</div> |
|
<div class="dlist"> |
|
<dl> |
|
<dt class="hdlist1">apply.ignoreWhitespace</dt> |
|
<dd> |
|
<p>When set to <em>change</em>, tells <em>git apply</em> to ignore changes in |
|
whitespace, in the same way as the <code>--ignore-space-change</code> |
|
option. |
|
When set to one of: no, none, never, false tells <em>git apply</em> to |
|
respect all whitespace differences. |
|
See <a href="git-apply.html">git-apply(1)</a>.</p> |
|
</dd> |
|
<dt class="hdlist1">apply.whitespace</dt> |
|
<dd> |
|
<p>Tells <em>git apply</em> how to handle whitespaces, in the same way |
|
as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.</p> |
|
</dd> |
|
</dl> |
|
</div> |
|
</div> |
|
</div> |
|
<div class="sect1"> |
|
<h2 id="_submodules">SUBMODULES</h2> |
|
<div class="sectionbody"> |
|
<div class="paragraph"> |
|
<p>If the patch contains any changes to submodules then <em>git apply</em> |
|
treats these changes as follows.</p> |
|
</div> |
|
<div class="paragraph"> |
|
<p>If <code>--index</code> is specified (explicitly or implicitly), then the submodule |
|
commits must match the index exactly for the patch to apply. If any |
|
of the submodules are checked-out, then these check-outs are completely |
|
ignored, i.e., they are not required to be up to date or clean and they |
|
are not updated.</p> |
|
</div> |
|
<div class="paragraph"> |
|
<p>If <code>--index</code> is not specified, then the submodule commits in the patch |
|
are ignored and only the absence or presence of the corresponding |
|
subdirectory is checked and (if possible) updated.</p> |
|
</div> |
|
</div> |
|
</div> |
|
<div class="sect1"> |
|
<h2 id="_see_also">SEE ALSO</h2> |
|
<div class="sectionbody"> |
|
<div class="paragraph"> |
|
<p><a href="git-am.html">git-am(1)</a>.</p> |
|
</div> |
|
</div> |
|
</div> |
|
<div class="sect1"> |
|
<h2 id="_git">GIT</h2> |
|
<div class="sectionbody"> |
|
<div class="paragraph"> |
|
<p>Part of the <a href="git.html">git(1)</a> suite</p> |
|
</div> |
|
</div> |
|
</div> |
|
</div> |
|
<div id="footer"> |
|
<div id="footer-text"> |
|
Last updated 2023-04-19 05:40:20 UTC |
|
</div> |
|
</div> |
|
</body> |
|
</html> |
