git-am.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-am(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-am(1) Manual Page</h1>
 444 <h2 id="_name">NAME</h2>
 445 <div class="sectionbody">
 446 <p>git-am - Apply a series of patches from a mailbox</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 am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
 455          [--[no-]3way] [--interactive] [--committer-date-is-author-date]
 456          [--ignore-date] [--ignore-space-change | --ignore-whitespace]
 457          [--whitespace=&lt;action&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
 458          [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
 459          [--[no-]scissors] [-S[&lt;keyid&gt;]] [--patch-format=&lt;format&gt;]
 460          [--quoted-cr=&lt;action&gt;]
 461          [--empty=(stop|drop|keep)]
 462          [(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;&#8203;]
 463 <em>git am</em> (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)</pre>
 464 </div>
 465 </div>
 466 </div>
 467 <div class="sect1">
 468 <h2 id="_description">DESCRIPTION</h2>
 469 <div class="sectionbody">
 470 <div class="paragraph">
 471 <p>Splits mail messages in a mailbox into commit log messages,
 472 authorship information, and patches, and applies them to the
 473 current branch. You could think of it as a reverse operation
 474 of <a href="git-format-patch.html">git-format-patch(1)</a> run on a branch with a straight
 475 history without merges.</p>
 476 </div>
 477 </div>
 478 </div>
 479 <div class="sect1">
 480 <h2 id="_options">OPTIONS</h2>
 481 <div class="sectionbody">
 482 <div class="dlist">
 483 <dl>
 484 <dt class="hdlist1">(&lt;mbox&gt;|&lt;Maildir&gt;)&#8230;&#8203;</dt>
 485 <dd>
 486 <p>The list of mailbox files to read patches from. If you do not
 487 supply this argument, the command reads from the standard input.
 488 If you supply directories, they will be treated as Maildirs.</p>
 489 </dd>
 490 <dt class="hdlist1">-s</dt>
 491 <dt class="hdlist1">--signoff</dt>
 492 <dd>
 493 <p>Add a <code>Signed-off-by</code> trailer to the commit message, using
 494 the committer identity of yourself.
 495 See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.</p>
 496 </dd>
 497 <dt class="hdlist1">-k</dt>
 498 <dt class="hdlist1">--keep</dt>
 499 <dd>
 500 <p>Pass <code>-k</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).</p>
 501 </dd>
 502 <dt class="hdlist1">--keep-non-patch</dt>
 503 <dd>
 504 <p>Pass <code>-b</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).</p>
 505 </dd>
 506 <dt class="hdlist1">--[no-]keep-cr</dt>
 507 <dd>
 508 <p>With <code>--keep-cr</code>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>)
 509 with the same option, to prevent it from stripping CR at the end of
 510 lines. <code>am.keepcr</code> configuration variable can be used to specify the
 511 default behaviour.  <code>--no-keep-cr</code> is useful to override <code>am.keepcr</code>.</p>
 512 </dd>
 513 <dt class="hdlist1">-c</dt>
 514 <dt class="hdlist1">--scissors</dt>
 515 <dd>
 516 <p>Remove everything in body before a scissors line (see
 517 <a href="git-mailinfo.html">git-mailinfo(1)</a>). Can be activated by default using
 518 the <code>mailinfo.scissors</code> configuration variable.</p>
 519 </dd>
 520 <dt class="hdlist1">--no-scissors</dt>
 521 <dd>
 522 <p>Ignore scissors lines (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).</p>
 523 </dd>
 524 <dt class="hdlist1">--quoted-cr=&lt;action&gt;</dt>
 525 <dd>
 526 <p>This flag will be passed down to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).</p>
 527 </dd>
 528 <dt class="hdlist1">--empty=(drop|keep|stop)</dt>
 529 <dd>
 530 <p>How to handle an e-mail message lacking a patch:</p>
 531 <div class="openblock">
 532 <div class="content">
 533 <div class="dlist">
 534 <dl>
 535 <dt class="hdlist1"><code>drop</code></dt>
 536 <dd>
 537 <p>The e-mail message will be skipped.</p>
 538 </dd>
 539 <dt class="hdlist1"><code>keep</code></dt>
 540 <dd>
 541 <p>An empty commit will be created, with the contents of the e-mail
 542 message as its log.</p>
 543 </dd>
 544 <dt class="hdlist1"><code>stop</code></dt>
 545 <dd>
 546 <p>The command will fail, stopping in the middle of the current <code>am</code>
 547 session. This is the default behavior.</p>
 548 </dd>
 549 </dl>
 550 </div>
 551 </div>
 552 </div>
 553 </dd>
 554 <dt class="hdlist1">-m</dt>
 555 <dt class="hdlist1">--message-id</dt>
 556 <dd>
 557 <p>Pass the <code>-m</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>),
 558 so that the Message-ID header is added to the commit message.
 559 The <code>am.messageid</code> configuration variable can be used to specify
 560 the default behaviour.</p>
 561 </dd>
 562 <dt class="hdlist1">--no-message-id</dt>
 563 <dd>
 564 <p>Do not add the Message-ID header to the commit message.
 565 <code>no-message-id</code> is useful to override <code>am.messageid</code>.</p>
 566 </dd>
 567 <dt class="hdlist1">-q</dt>
 568 <dt class="hdlist1">--quiet</dt>
 569 <dd>
 570 <p>Be quiet. Only print error messages.</p>
 571 </dd>
 572 <dt class="hdlist1">-u</dt>
 573 <dt class="hdlist1">--utf8</dt>
 574 <dd>
 575 <p>Pass <code>-u</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
 576 The proposed commit log message taken from the e-mail
 577 is re-coded into UTF-8 encoding (configuration variable
 578 <code>i18n.commitEncoding</code> can be used to specify the project&#8217;s
 579 preferred encoding if it is not UTF-8).</p>
 580 <div class="paragraph">
 581 <p>This was optional in prior versions of git, but now it is the
 582 default.   You can use <code>--no-utf8</code> to override this.</p>
 583 </div>
 584 </dd>
 585 <dt class="hdlist1">--no-utf8</dt>
 586 <dd>
 587 <p>Pass <code>-n</code> flag to <em>git mailinfo</em> (see
 588 <a href="git-mailinfo.html">git-mailinfo(1)</a>).</p>
 589 </dd>
 590 <dt class="hdlist1">-3</dt>
 591 <dt class="hdlist1">--3way</dt>
 592 <dt class="hdlist1">--no-3way</dt>
 593 <dd>
 594 <p>When the patch does not apply cleanly, fall back on
 595 3-way merge if the patch records the identity of blobs
 596 it is supposed to apply to and we have those blobs
 597 available locally. <code>--no-3way</code> can be used to override
 598 am.threeWay configuration variable. For more information,
 599 see am.threeWay in <a href="git-config.html">git-config(1)</a>.</p>
 600 </dd>
 601 <dt class="hdlist1">--rerere-autoupdate</dt>
 602 <dt class="hdlist1">--no-rerere-autoupdate</dt>
 603 <dd>
 604 <p>After the rerere mechanism reuses a recorded resolution on
 605 the current conflict to update the files in the working
 606 tree, allow it to also update the index with the result of
 607 resolution.  <code>--no-rerere-autoupdate</code> is a good way to
 608 double-check what <code>rerere</code> did and catch potential
 609 mismerges, before committing the result to the index with a
 610 separate <code>git</code> <code>add</code>.</p>
 611 </dd>
 612 <dt class="hdlist1">--ignore-space-change</dt>
 613 <dt class="hdlist1">--ignore-whitespace</dt>
 614 <dt class="hdlist1">--whitespace=&lt;action&gt;</dt>
 615 <dt class="hdlist1">-C&lt;n&gt;</dt>
 616 <dt class="hdlist1">-p&lt;n&gt;</dt>
 617 <dt class="hdlist1">--directory=&lt;dir&gt;</dt>
 618 <dt class="hdlist1">--exclude=&lt;path&gt;</dt>
 619 <dt class="hdlist1">--include=&lt;path&gt;</dt>
 620 <dt class="hdlist1">--reject</dt>
 621 <dd>
 622 <p>These flags are passed to the <em>git apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
 623 program that applies
 624 the patch.</p>
 625 <div class="paragraph">
 626 <p>Valid &lt;action&gt; for the <code>--whitespace</code> option are:
 627 <code>nowarn</code>, <code>warn</code>, <code>fix</code>, <code>error</code>, and <code>error-all</code>.</p>
 628 </div>
 629 </dd>
 630 <dt class="hdlist1">--patch-format</dt>
 631 <dd>
 632 <p>By default the command will try to detect the patch format
 633 automatically. This option allows the user to bypass the automatic
 634 detection and specify the patch format that the patch(es) should be
 635 interpreted as. Valid formats are mbox, mboxrd,
 636 stgit, stgit-series, and hg.</p>
 637 </dd>
 638 <dt class="hdlist1">-i</dt>
 639 <dt class="hdlist1">--interactive</dt>
 640 <dd>
 641 <p>Run interactively.</p>
 642 </dd>
 643 <dt class="hdlist1">-n</dt>
 644 <dt class="hdlist1">--no-verify</dt>
 645 <dd>
 646 <p>By default, the pre-applypatch and applypatch-msg hooks are run.
 647 When any of <code>--no-verify</code> or <code>-n</code> is given, these are bypassed.
 648 See also <a href="githooks.html">githooks(5)</a>.</p>
 649 </dd>
 650 <dt class="hdlist1">--committer-date-is-author-date</dt>
 651 <dd>
 652 <p>By default the command records the date from the e-mail
 653 message as the commit author date, and uses the time of
 654 commit creation as the committer date. This allows the
 655 user to lie about the committer date by using the same
 656 value as the author date.</p>
 657 </dd>
 658 <dt class="hdlist1">--ignore-date</dt>
 659 <dd>
 660 <p>By default the command records the date from the e-mail
 661 message as the commit author date, and uses the time of
 662 commit creation as the committer date. This allows the
 663 user to lie about the author date by using the same
 664 value as the committer date.</p>
 665 </dd>
 666 <dt class="hdlist1">--skip</dt>
 667 <dd>
 668 <p>Skip the current patch.  This is only meaningful when
 669 restarting an aborted patch.</p>
 670 </dd>
 671 <dt class="hdlist1">-S[&lt;keyid&gt;]</dt>
 672 <dt class="hdlist1">--gpg-sign[=&lt;keyid&gt;]</dt>
 673 <dt class="hdlist1">--no-gpg-sign</dt>
 674 <dd>
 675 <p>GPG-sign commits. The <code>keyid</code> argument is optional and
 676 defaults to the committer identity; if specified, it must be
 677 stuck to the option without a space. <code>--no-gpg-sign</code> is useful to
 678 countermand both <code>commit.gpgSign</code> configuration variable, and
 679 earlier <code>--gpg-sign</code>.</p>
 680 </dd>
 681 <dt class="hdlist1">--continue</dt>
 682 <dt class="hdlist1">-r</dt>
 683 <dt class="hdlist1">--resolved</dt>
 684 <dd>
 685 <p>After a patch failure (e.g. attempting to apply
 686 conflicting patch), the user has applied it by hand and
 687 the index file stores the result of the application.
 688 Make a commit using the authorship and commit log
 689 extracted from the e-mail message and the current index
 690 file, and continue.</p>
 691 </dd>
 692 <dt class="hdlist1">--resolvemsg=&lt;msg&gt;</dt>
 693 <dd>
 694 <p>When a patch failure occurs, &lt;msg&gt; will be printed
 695 to the screen before exiting.  This overrides the
 696 standard message informing you to use <code>--continue</code>
 697 or <code>--skip</code> to handle the failure.  This is solely
 698 for internal use between <em>git rebase</em> and <em>git am</em>.</p>
 699 </dd>
 700 <dt class="hdlist1">--abort</dt>
 701 <dd>
 702 <p>Restore the original branch and abort the patching operation.
 703 Revert the contents of files involved in the am operation to their
 704 pre-am state.</p>
 705 </dd>
 706 <dt class="hdlist1">--quit</dt>
 707 <dd>
 708 <p>Abort the patching operation but keep HEAD and the index
 709 untouched.</p>
 710 </dd>
 711 <dt class="hdlist1">--retry</dt>
 712 <dd>
 713 <p>Try to apply the last conflicting patch again. This is generally
 714 only useful for passing extra options to the retry attempt
 715 (e.g., <code>--3way</code>), since otherwise you&#8217;ll just see the same
 716 failure again.</p>
 717 </dd>
 718 <dt class="hdlist1">--show-current-patch[=(diff|raw)]</dt>
 719 <dd>
 720 <p>Show the message at which <code>git</code> <code>am</code> has stopped due to
 721 conflicts.  If <code>raw</code> is specified, show the raw contents of
 722 the e-mail message; if <code>diff</code>, show the diff portion only.
 723 Defaults to <code>raw</code>.</p>
 724 </dd>
 725 <dt class="hdlist1">--allow-empty</dt>
 726 <dd>
 727 <p>After a patch failure on an input e-mail message lacking a patch,
 728 create an empty commit with the contents of the e-mail message
 729 as its log message.</p>
 730 </dd>
 731 </dl>
 732 </div>
 733 </div>
 734 </div>
 735 <div class="sect1">
 736 <h2 id="_discussion">DISCUSSION</h2>
 737 <div class="sectionbody">
 738 <div class="paragraph">
 739 <p>The commit author name is taken from the "From: " line of the
 740 message, and commit author date is taken from the "Date: " line
 741 of the message.  The "Subject: " line is used as the title of
 742 the commit, after stripping common prefix "[PATCH &lt;anything&gt;]".
 743 The "Subject: " line is supposed to concisely describe what the
 744 commit is about in one line of text.</p>
 745 </div>
 746 <div class="paragraph">
 747 <p>"From: ", "Date: ", and "Subject: " lines starting the body override the
 748 respective commit author name and title values taken from the headers.</p>
 749 </div>
 750 <div class="paragraph">
 751 <p>The commit message is formed by the title taken from the
 752 "Subject: ", a blank line and the body of the message up to
 753 where the patch begins.  Excess whitespace at the end of each
 754 line is automatically stripped.</p>
 755 </div>
 756 <div class="paragraph">
 757 <p>The patch is expected to be inline, directly following the
 758 message.  Any line that is of the form:</p>
 759 </div>
 760 <div class="ulist">
 761 <ul>
 762 <li>
 763 <p>three-dashes and end-of-line, or</p>
 764 </li>
 765 <li>
 766 <p>a line that begins with "diff -", or</p>
 767 </li>
 768 <li>
 769 <p>a line that begins with "Index: "</p>
 770 </li>
 771 </ul>
 772 </div>
 773 <div class="paragraph">
 774 <p>is taken as the beginning of a patch, and the commit log message
 775 is terminated before the first occurrence of such a line.</p>
 776 </div>
 777 <div class="paragraph">
 778 <p>When initially invoking <code>git</code> <code>am</code>, you give it the names of the mailboxes
 779 to process.  Upon seeing the first patch that does not apply, it
 780 aborts in the middle.  You can recover from this in one of two ways:</p>
 781 </div>
 782 <div class="olist arabic">
 783 <ol class="arabic">
 784 <li>
 785 <p>skip the current patch by re-running the command with the <code>--skip</code>
 786 option.</p>
 787 </li>
 788 <li>
 789 <p>hand resolve the conflict in the working directory, and update
 790 the index file to bring it into a state that the patch should
 791 have produced.  Then run the command with the <code>--continue</code> option.</p>
 792 </li>
 793 </ol>
 794 </div>
 795 <div class="paragraph">
 796 <p>The command refuses to process new mailboxes until the current
 797 operation is finished, so if you decide to start over from scratch,
 798 run <code>git</code> <code>am</code> <code>--abort</code> before running the command with mailbox
 799 names.</p>
 800 </div>
 801 <div class="paragraph">
 802 <p>Before any patches are applied, ORIG_HEAD is set to the tip of the
 803 current branch.  This is useful if you have problems with multiple
 804 commits, like running <em>git am</em> on the wrong branch or an error in the
 805 commits that is more easily fixed by changing the mailbox (e.g.
 806 errors in the "From:" lines).</p>
 807 </div>
 808 </div>
 809 </div>
 810 <div class="sect1">
 811 <h2 id="_hooks">HOOKS</h2>
 812 <div class="sectionbody">
 813 <div class="paragraph">
 814 <p>This command can run <code>applypatch-msg</code>, <code>pre-applypatch</code>,
 815 and <code>post-applypatch</code> hooks.  See <a href="githooks.html">githooks(5)</a> for more
 816 information.</p>
 817 </div>
 818 </div>
 819 </div>
 820 <div class="sect1">
 821 <h2 id="_configuration">CONFIGURATION</h2>
 822 <div class="sectionbody">
 823 <div class="paragraph">
 824 <p>Everything below this line in this section is selectively included
 825 from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
 826 as what&#8217;s found there:</p>
 827 </div>
 828 <div class="dlist">
 829 <dl>
 830 <dt class="hdlist1">am.keepcr</dt>
 831 <dd>
 832 <p>If true, git-am will call git-mailsplit for patches in mbox format
 833 with parameter <code>--keep-cr</code>. In this case git-mailsplit will
 834 not remove \r from lines ending with \r\n. Can be overridden
 835 by giving <code>--no-keep-cr</code> from the command line.
 836 See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.</p>
 837 </dd>
 838 <dt class="hdlist1">am.threeWay</dt>
 839 <dd>
 840 <p>By default, <code>git</code> <code>am</code> will fail if the patch does not apply cleanly. When
 841 set to true, this setting tells <code>git</code> <code>am</code> to fall back on 3-way merge if
 842 the patch records the identity of blobs it is supposed to apply to and
 843 we have those blobs available locally (equivalent to giving the <code>--3way</code>
 844 option from the command line). Defaults to <code>false</code>.
 845 See <a href="git-am.html">git-am(1)</a>.</p>
 846 </dd>
 847 </dl>
 848 </div>
 849 </div>
 850 </div>
 851 <div class="sect1">
 852 <h2 id="_see_also">SEE ALSO</h2>
 853 <div class="sectionbody">
 854 <div class="paragraph">
 855 <p><a href="git-apply.html">git-apply(1)</a>,
 856 <a href="git-format-patch.html">git-format-patch(1)</a>.</p>
 857 </div>
 858 </div>
 859 </div>
 860 <div class="sect1">
 861 <h2 id="_git">GIT</h2>
 862 <div class="sectionbody">
 863 <div class="paragraph">
 864 <p>Part of the <a href="git.html">git(1)</a> suite</p>
 865 </div>
 866 </div>
 867 </div>
 868 </div>
 869 <div id="footer">
 870 <div id="footer-text">
 871 Last updated 2024-06-17 16:42:55 -0700
 872 </div>
 873 </div>
 874 </body>
 875 </html>