"Fossies" - the Fresh Open Source Software Archive

Member "git-am.html" (15 Dec 2018, 29038 Bytes) of package /linux/misc/git-htmldocs-2.20.1.tar.xz:


As a special service "Fossies" has tried to format the requested source page into HTML format using (guessed) HTML source code syntax highlighting (style: standard) with prefixed line numbers. Alternatively you can here view or download the uninterpreted source code file.

    1 <?xml version="1.0" encoding="UTF-8"?>
    2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
    3     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
    4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
    5 <head>
    6 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
    7 <meta name="generator" content="AsciiDoc 8.6.10" />
    8 <title>git-am(1)</title>
    9 <style type="text/css">
   10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
   11 
   12 /* Default font. */
   13 body {
   14   font-family: Georgia,serif;
   15 }
   16 
   17 /* Title font. */
   18 h1, h2, h3, h4, h5, h6,
   19 div.title, caption.title,
   20 thead, p.table.header,
   21 #toctitle,
   22 #author, #revnumber, #revdate, #revremark,
   23 #footer {
   24   font-family: Arial,Helvetica,sans-serif;
   25 }
   26 
   27 body {
   28   margin: 1em 5% 1em 5%;
   29 }
   30 
   31 a {
   32   color: blue;
   33   text-decoration: underline;
   34 }
   35 a:visited {
   36   color: fuchsia;
   37 }
   38 
   39 em {
   40   font-style: italic;
   41   color: navy;
   42 }
   43 
   44 strong {
   45   font-weight: bold;
   46   color: #083194;
   47 }
   48 
   49 h1, h2, h3, h4, h5, h6 {
   50   color: #527bbd;
   51   margin-top: 1.2em;
   52   margin-bottom: 0.5em;
   53   line-height: 1.3;
   54 }
   55 
   56 h1, h2, h3 {
   57   border-bottom: 2px solid silver;
   58 }
   59 h2 {
   60   padding-top: 0.5em;
   61 }
   62 h3 {
   63   float: left;
   64 }
   65 h3 + * {
   66   clear: left;
   67 }
   68 h5 {
   69   font-size: 1.0em;
   70 }
   71 
   72 div.sectionbody {
   73   margin-left: 0;
   74 }
   75 
   76 hr {
   77   border: 1px solid silver;
   78 }
   79 
   80 p {
   81   margin-top: 0.5em;
   82   margin-bottom: 0.5em;
   83 }
   84 
   85 ul, ol, li > p {
   86   margin-top: 0;
   87 }
   88 ul > li     { color: #aaa; }
   89 ul > li > * { color: black; }
   90 
   91 .monospaced, code, pre {
   92   font-family: "Courier New", Courier, monospace;
   93   font-size: inherit;
   94   color: navy;
   95   padding: 0;
   96   margin: 0;
   97 }
   98 pre {
   99   white-space: pre-wrap;
  100 }
  101 
  102 #author {
  103   color: #527bbd;
  104   font-weight: bold;
  105   font-size: 1.1em;
  106 }
  107 #email {
  108 }
  109 #revnumber, #revdate, #revremark {
  110 }
  111 
  112 #footer {
  113   font-size: small;
  114   border-top: 2px solid silver;
  115   padding-top: 0.5em;
  116   margin-top: 4.0em;
  117 }
  118 #footer-text {
  119   float: left;
  120   padding-bottom: 0.5em;
  121 }
  122 #footer-badges {
  123   float: right;
  124   padding-bottom: 0.5em;
  125 }
  126 
  127 #preamble {
  128   margin-top: 1.5em;
  129   margin-bottom: 1.5em;
  130 }
  131 div.imageblock, div.exampleblock, div.verseblock,
  132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
  133 div.admonitionblock {
  134   margin-top: 1.0em;
  135   margin-bottom: 1.5em;
  136 }
  137 div.admonitionblock {
  138   margin-top: 2.0em;
  139   margin-bottom: 2.0em;
  140   margin-right: 10%;
  141   color: #606060;
  142 }
  143 
  144 div.content { /* Block element content. */
  145   padding: 0;
  146 }
  147 
  148 /* Block element titles. */
  149 div.title, caption.title {
  150   color: #527bbd;
  151   font-weight: bold;
  152   text-align: left;
  153   margin-top: 1.0em;
  154   margin-bottom: 0.5em;
  155 }
  156 div.title + * {
  157   margin-top: 0;
  158 }
  159 
  160 td div.title:first-child {
  161   margin-top: 0.0em;
  162 }
  163 div.content div.title:first-child {
  164   margin-top: 0.0em;
  165 }
  166 div.content + div.title {
  167   margin-top: 0.0em;
  168 }
  169 
  170 div.sidebarblock > div.content {
  171   background: #ffffee;
  172   border: 1px solid #dddddd;
  173   border-left: 4px solid #f0f0f0;
  174   padding: 0.5em;
  175 }
  176 
  177 div.listingblock > div.content {
  178   border: 1px solid #dddddd;
  179   border-left: 5px solid #f0f0f0;
  180   background: #f8f8f8;
  181   padding: 0.5em;
  182 }
  183 
  184 div.quoteblock, div.verseblock {
  185   padding-left: 1.0em;
  186   margin-left: 1.0em;
  187   margin-right: 10%;
  188   border-left: 5px solid #f0f0f0;
  189   color: #888;
  190 }
  191 
  192 div.quoteblock > div.attribution {
  193   padding-top: 0.5em;
  194   text-align: right;
  195 }
  196 
  197 div.verseblock > pre.content {
  198   font-family: inherit;
  199   font-size: inherit;
  200 }
  201 div.verseblock > div.attribution {
  202   padding-top: 0.75em;
  203   text-align: left;
  204 }
  205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
  206 div.verseblock + div.attribution {
  207   text-align: left;
  208 }
  209 
  210 div.admonitionblock .icon {
  211   vertical-align: top;
  212   font-size: 1.1em;
  213   font-weight: bold;
  214   text-decoration: underline;
  215   color: #527bbd;
  216   padding-right: 0.5em;
  217 }
  218 div.admonitionblock td.content {
  219   padding-left: 0.5em;
  220   border-left: 3px solid #dddddd;
  221 }
  222 
  223 div.exampleblock > div.content {
  224   border-left: 3px solid #dddddd;
  225   padding-left: 0.5em;
  226 }
  227 
  228 div.imageblock div.content { padding-left: 0; }
  229 span.image img { border-style: none; vertical-align: text-bottom; }
  230 a.image:visited { color: white; }
  231 
  232 dl {
  233   margin-top: 0.8em;
  234   margin-bottom: 0.8em;
  235 }
  236 dt {
  237   margin-top: 0.5em;
  238   margin-bottom: 0;
  239   font-style: normal;
  240   color: navy;
  241 }
  242 dd > *:first-child {
  243   margin-top: 0.1em;
  244 }
  245 
  246 ul, ol {
  247     list-style-position: outside;
  248 }
  249 ol.arabic {
  250   list-style-type: decimal;
  251 }
  252 ol.loweralpha {
  253   list-style-type: lower-alpha;
  254 }
  255 ol.upperalpha {
  256   list-style-type: upper-alpha;
  257 }
  258 ol.lowerroman {
  259   list-style-type: lower-roman;
  260 }
  261 ol.upperroman {
  262   list-style-type: upper-roman;
  263 }
  264 
  265 div.compact ul, div.compact ol,
  266 div.compact p, div.compact p,
  267 div.compact div, div.compact div {
  268   margin-top: 0.1em;
  269   margin-bottom: 0.1em;
  270 }
  271 
  272 tfoot {
  273   font-weight: bold;
  274 }
  275 td > div.verse {
  276   white-space: pre;
  277 }
  278 
  279 div.hdlist {
  280   margin-top: 0.8em;
  281   margin-bottom: 0.8em;
  282 }
  283 div.hdlist tr {
  284   padding-bottom: 15px;
  285 }
  286 dt.hdlist1.strong, td.hdlist1.strong {
  287   font-weight: bold;
  288 }
  289 td.hdlist1 {
  290   vertical-align: top;
  291   font-style: normal;
  292   padding-right: 0.8em;
  293   color: navy;
  294 }
  295 td.hdlist2 {
  296   vertical-align: top;
  297 }
  298 div.hdlist.compact tr {
  299   margin: 0;
  300   padding-bottom: 0;
  301 }
  302 
  303 .comment {
  304   background: yellow;
  305 }
  306 
  307 .footnote, .footnoteref {
  308   font-size: 0.8em;
  309 }
  310 
  311 span.footnote, span.footnoteref {
  312   vertical-align: super;
  313 }
  314 
  315 #footnotes {
  316   margin: 20px 0 20px 0;
  317   padding: 7px 0 0 0;
  318 }
  319 
  320 #footnotes div.footnote {
  321   margin: 0 0 5px 0;
  322 }
  323 
  324 #footnotes hr {
  325   border: none;
  326   border-top: 1px solid silver;
  327   height: 1px;
  328   text-align: left;
  329   margin-left: 0;
  330   width: 20%;
  331   min-width: 100px;
  332 }
  333 
  334 div.colist td {
  335   padding-right: 0.5em;
  336   padding-bottom: 0.3em;
  337   vertical-align: top;
  338 }
  339 div.colist td img {
  340   margin-top: 0.3em;
  341 }
  342 
  343 @media print {
  344   #footer-badges { display: none; }
  345 }
  346 
  347 #toc {
  348   margin-bottom: 2.5em;
  349 }
  350 
  351 #toctitle {
  352   color: #527bbd;
  353   font-size: 1.1em;
  354   font-weight: bold;
  355   margin-top: 1.0em;
  356   margin-bottom: 0.1em;
  357 }
  358 
  359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
  360   margin-top: 0;
  361   margin-bottom: 0;
  362 }
  363 div.toclevel2 {
  364   margin-left: 2em;
  365   font-size: 0.9em;
  366 }
  367 div.toclevel3 {
  368   margin-left: 4em;
  369   font-size: 0.9em;
  370 }
  371 div.toclevel4 {
  372   margin-left: 6em;
  373   font-size: 0.9em;
  374 }
  375 
  376 span.aqua { color: aqua; }
  377 span.black { color: black; }
  378 span.blue { color: blue; }
  379 span.fuchsia { color: fuchsia; }
  380 span.gray { color: gray; }
  381 span.green { color: green; }
  382 span.lime { color: lime; }
  383 span.maroon { color: maroon; }
  384 span.navy { color: navy; }
  385 span.olive { color: olive; }
  386 span.purple { color: purple; }
  387 span.red { color: red; }
  388 span.silver { color: silver; }
  389 span.teal { color: teal; }
  390 span.white { color: white; }
  391 span.yellow { color: yellow; }
  392 
  393 span.aqua-background { background: aqua; }
  394 span.black-background { background: black; }
  395 span.blue-background { background: blue; }
  396 span.fuchsia-background { background: fuchsia; }
  397 span.gray-background { background: gray; }
  398 span.green-background { background: green; }
  399 span.lime-background { background: lime; }
  400 span.maroon-background { background: maroon; }
  401 span.navy-background { background: navy; }
  402 span.olive-background { background: olive; }
  403 span.purple-background { background: purple; }
  404 span.red-background { background: red; }
  405 span.silver-background { background: silver; }
  406 span.teal-background { background: teal; }
  407 span.white-background { background: white; }
  408 span.yellow-background { background: yellow; }
  409 
  410 span.big { font-size: 2em; }
  411 span.small { font-size: 0.6em; }
  412 
  413 span.underline { text-decoration: underline; }
  414 span.overline { text-decoration: overline; }
  415 span.line-through { text-decoration: line-through; }
  416 
  417 div.unbreakable { page-break-inside: avoid; }
  418 
  419 
  420 /*
  421  * xhtml11 specific
  422  *
  423  * */
  424 
  425 div.tableblock {
  426   margin-top: 1.0em;
  427   margin-bottom: 1.5em;
  428 }
  429 div.tableblock > table {
  430   border: 3px solid #527bbd;
  431 }
  432 thead, p.table.header {
  433   font-weight: bold;
  434   color: #527bbd;
  435 }
  436 p.table {
  437   margin-top: 0;
  438 }
  439 /* Because the table frame attribute is overriden by CSS in most browsers. */
  440 div.tableblock > table[frame="void"] {
  441   border-style: none;
  442 }
  443 div.tableblock > table[frame="hsides"] {
  444   border-left-style: none;
  445   border-right-style: none;
  446 }
  447 div.tableblock > table[frame="vsides"] {
  448   border-top-style: none;
  449   border-bottom-style: none;
  450 }
  451 
  452 
  453 /*
  454  * html5 specific
  455  *
  456  * */
  457 
  458 table.tableblock {
  459   margin-top: 1.0em;
  460   margin-bottom: 1.5em;
  461 }
  462 thead, p.tableblock.header {
  463   font-weight: bold;
  464   color: #527bbd;
  465 }
  466 p.tableblock {
  467   margin-top: 0;
  468 }
  469 table.tableblock {
  470   border-width: 3px;
  471   border-spacing: 0px;
  472   border-style: solid;
  473   border-color: #527bbd;
  474   border-collapse: collapse;
  475 }
  476 th.tableblock, td.tableblock {
  477   border-width: 1px;
  478   padding: 4px;
  479   border-style: solid;
  480   border-color: #527bbd;
  481 }
  482 
  483 table.tableblock.frame-topbot {
  484   border-left-style: hidden;
  485   border-right-style: hidden;
  486 }
  487 table.tableblock.frame-sides {
  488   border-top-style: hidden;
  489   border-bottom-style: hidden;
  490 }
  491 table.tableblock.frame-none {
  492   border-style: hidden;
  493 }
  494 
  495 th.tableblock.halign-left, td.tableblock.halign-left {
  496   text-align: left;
  497 }
  498 th.tableblock.halign-center, td.tableblock.halign-center {
  499   text-align: center;
  500 }
  501 th.tableblock.halign-right, td.tableblock.halign-right {
  502   text-align: right;
  503 }
  504 
  505 th.tableblock.valign-top, td.tableblock.valign-top {
  506   vertical-align: top;
  507 }
  508 th.tableblock.valign-middle, td.tableblock.valign-middle {
  509   vertical-align: middle;
  510 }
  511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
  512   vertical-align: bottom;
  513 }
  514 
  515 
  516 /*
  517  * manpage specific
  518  *
  519  * */
  520 
  521 body.manpage h1 {
  522   padding-top: 0.5em;
  523   padding-bottom: 0.5em;
  524   border-top: 2px solid silver;
  525   border-bottom: 2px solid silver;
  526 }
  527 body.manpage h2 {
  528   border-style: none;
  529 }
  530 body.manpage div.sectionbody {
  531   margin-left: 3em;
  532 }
  533 
  534 @media print {
  535   body.manpage div#toc { display: none; }
  536 }
  537 
  538 
  539 </style>
  540 <script type="text/javascript">
  541 /*<![CDATA[*/
  542 var asciidoc = {  // Namespace.
  543 
  544 /////////////////////////////////////////////////////////////////////
  545 // Table Of Contents generator
  546 /////////////////////////////////////////////////////////////////////
  547 
  548 /* Author: Mihai Bazon, September 2002
  549  * http://students.infoiasi.ro/~mishoo
  550  *
  551  * Table Of Content generator
  552  * Version: 0.4
  553  *
  554  * Feel free to use this script under the terms of the GNU General Public
  555  * License, as long as you do not remove or alter this notice.
  556  */
  557 
  558  /* modified by Troy D. Hanson, September 2006. License: GPL */
  559  /* modified by Stuart Rackham, 2006, 2009. License: GPL */
  560 
  561 // toclevels = 1..4.
  562 toc: function (toclevels) {
  563 
  564   function getText(el) {
  565     var text = "";
  566     for (var i = el.firstChild; i != null; i = i.nextSibling) {
  567       if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
  568         text += i.data;
  569       else if (i.firstChild != null)
  570         text += getText(i);
  571     }
  572     return text;
  573   }
  574 
  575   function TocEntry(el, text, toclevel) {
  576     this.element = el;
  577     this.text = text;
  578     this.toclevel = toclevel;
  579   }
  580 
  581   function tocEntries(el, toclevels) {
  582     var result = new Array;
  583     var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
  584     // Function that scans the DOM tree for header elements (the DOM2
  585     // nodeIterator API would be a better technique but not supported by all
  586     // browsers).
  587     var iterate = function (el) {
  588       for (var i = el.firstChild; i != null; i = i.nextSibling) {
  589         if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
  590           var mo = re.exec(i.tagName);
  591           if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
  592             result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
  593           }
  594           iterate(i);
  595         }
  596       }
  597     }
  598     iterate(el);
  599     return result;
  600   }
  601 
  602   var toc = document.getElementById("toc");
  603   if (!toc) {
  604     return;
  605   }
  606 
  607   // Delete existing TOC entries in case we're reloading the TOC.
  608   var tocEntriesToRemove = [];
  609   var i;
  610   for (i = 0; i < toc.childNodes.length; i++) {
  611     var entry = toc.childNodes[i];
  612     if (entry.nodeName.toLowerCase() == 'div'
  613      && entry.getAttribute("class")
  614      && entry.getAttribute("class").match(/^toclevel/))
  615       tocEntriesToRemove.push(entry);
  616   }
  617   for (i = 0; i < tocEntriesToRemove.length; i++) {
  618     toc.removeChild(tocEntriesToRemove[i]);
  619   }
  620 
  621   // Rebuild TOC entries.
  622   var entries = tocEntries(document.getElementById("content"), toclevels);
  623   for (var i = 0; i < entries.length; ++i) {
  624     var entry = entries[i];
  625     if (entry.element.id == "")
  626       entry.element.id = "_toc_" + i;
  627     var a = document.createElement("a");
  628     a.href = "#" + entry.element.id;
  629     a.appendChild(document.createTextNode(entry.text));
  630     var div = document.createElement("div");
  631     div.appendChild(a);
  632     div.className = "toclevel" + entry.toclevel;
  633     toc.appendChild(div);
  634   }
  635   if (entries.length == 0)
  636     toc.parentNode.removeChild(toc);
  637 },
  638 
  639 
  640 /////////////////////////////////////////////////////////////////////
  641 // Footnotes generator
  642 /////////////////////////////////////////////////////////////////////
  643 
  644 /* Based on footnote generation code from:
  645  * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
  646  */
  647 
  648 footnotes: function () {
  649   // Delete existing footnote entries in case we're reloading the footnodes.
  650   var i;
  651   var noteholder = document.getElementById("footnotes");
  652   if (!noteholder) {
  653     return;
  654   }
  655   var entriesToRemove = [];
  656   for (i = 0; i < noteholder.childNodes.length; i++) {
  657     var entry = noteholder.childNodes[i];
  658     if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
  659       entriesToRemove.push(entry);
  660   }
  661   for (i = 0; i < entriesToRemove.length; i++) {
  662     noteholder.removeChild(entriesToRemove[i]);
  663   }
  664 
  665   // Rebuild footnote entries.
  666   var cont = document.getElementById("content");
  667   var spans = cont.getElementsByTagName("span");
  668   var refs = {};
  669   var n = 0;
  670   for (i=0; i<spans.length; i++) {
  671     if (spans[i].className == "footnote") {
  672       n++;
  673       var note = spans[i].getAttribute("data-note");
  674       if (!note) {
  675         // Use [\s\S] in place of . so multi-line matches work.
  676         // Because JavaScript has no s (dotall) regex flag.
  677         note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
  678         spans[i].innerHTML =
  679           "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
  680           "' title='View footnote' class='footnote'>" + n + "</a>]";
  681         spans[i].setAttribute("data-note", note);
  682       }
  683       noteholder.innerHTML +=
  684         "<div class='footnote' id='_footnote_" + n + "'>" +
  685         "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
  686         n + "</a>. " + note + "</div>";
  687       var id =spans[i].getAttribute("id");
  688       if (id != null) refs["#"+id] = n;
  689     }
  690   }
  691   if (n == 0)
  692     noteholder.parentNode.removeChild(noteholder);
  693   else {
  694     // Process footnoterefs.
  695     for (i=0; i<spans.length; i++) {
  696       if (spans[i].className == "footnoteref") {
  697         var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
  698         href = href.match(/#.*/)[0];  // Because IE return full URL.
  699         n = refs[href];
  700         spans[i].innerHTML =
  701           "[<a href='#_footnote_" + n +
  702           "' title='View footnote' class='footnote'>" + n + "</a>]";
  703       }
  704     }
  705   }
  706 },
  707 
  708 install: function(toclevels) {
  709   var timerId;
  710 
  711   function reinstall() {
  712     asciidoc.footnotes();
  713     if (toclevels) {
  714       asciidoc.toc(toclevels);
  715     }
  716   }
  717 
  718   function reinstallAndRemoveTimer() {
  719     clearInterval(timerId);
  720     reinstall();
  721   }
  722 
  723   timerId = setInterval(reinstall, 500);
  724   if (document.addEventListener)
  725     document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
  726   else
  727     window.onload = reinstallAndRemoveTimer;
  728 }
  729 
  730 }
  731 asciidoc.install();
  732 /*]]>*/
  733 </script>
  734 </head>
  735 <body class="manpage">
  736 <div id="header">
  737 <h1>
  738 git-am(1) Manual Page
  739 </h1>
  740 <h2>NAME</h2>
  741 <div class="sectionbody">
  742 <p>git-am -
  743    Apply a series of patches from a mailbox
  744 </p>
  745 </div>
  746 </div>
  747 <div id="content">
  748 <div class="sect1">
  749 <h2 id="_synopsis">SYNOPSIS</h2>
  750 <div class="sectionbody">
  751 <div class="verseblock">
  752 <pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
  753          [--[no-]3way] [--interactive] [--committer-date-is-author-date]
  754          [--ignore-date] [--ignore-space-change | --ignore-whitespace]
  755          [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
  756          [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
  757          [--[no-]scissors] [-S[&lt;keyid&gt;]] [--patch-format=&lt;format&gt;]
  758          [(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;]
  759 <em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch)</pre>
  760 <div class="attribution">
  761 </div></div>
  762 </div>
  763 </div>
  764 <div class="sect1">
  765 <h2 id="_description">DESCRIPTION</h2>
  766 <div class="sectionbody">
  767 <div class="paragraph"><p>Splits mail messages in a mailbox into commit log message,
  768 authorship information and patches, and applies them to the
  769 current branch.</p></div>
  770 </div>
  771 </div>
  772 <div class="sect1">
  773 <h2 id="_options">OPTIONS</h2>
  774 <div class="sectionbody">
  775 <div class="dlist"><dl>
  776 <dt class="hdlist1">
  777 (&lt;mbox&gt;|&lt;Maildir&gt;)&#8230;
  778 </dt>
  779 <dd>
  780 <p>
  781         The list of mailbox files to read patches from. If you do not
  782         supply this argument, the command reads from the standard input.
  783         If you supply directories, they will be treated as Maildirs.
  784 </p>
  785 </dd>
  786 <dt class="hdlist1">
  787 -s
  788 </dt>
  789 <dt class="hdlist1">
  790 --signoff
  791 </dt>
  792 <dd>
  793 <p>
  794         Add a <code>Signed-off-by:</code> line to the commit message, using
  795         the committer identity of yourself.
  796         See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
  797 </p>
  798 </dd>
  799 <dt class="hdlist1">
  800 -k
  801 </dt>
  802 <dt class="hdlist1">
  803 --keep
  804 </dt>
  805 <dd>
  806 <p>
  807         Pass <code>-k</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
  808 </p>
  809 </dd>
  810 <dt class="hdlist1">
  811 --keep-non-patch
  812 </dt>
  813 <dd>
  814 <p>
  815         Pass <code>-b</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
  816 </p>
  817 </dd>
  818 <dt class="hdlist1">
  819 --[no-]keep-cr
  820 </dt>
  821 <dd>
  822 <p>
  823         With <code>--keep-cr</code>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>)
  824         with the same option, to prevent it from stripping CR at the end of
  825         lines. <code>am.keepcr</code> configuration variable can be used to specify the
  826         default behaviour.  <code>--no-keep-cr</code> is useful to override <code>am.keepcr</code>.
  827 </p>
  828 </dd>
  829 <dt class="hdlist1">
  830 -c
  831 </dt>
  832 <dt class="hdlist1">
  833 --scissors
  834 </dt>
  835 <dd>
  836 <p>
  837         Remove everything in body before a scissors line (see
  838         <a href="git-mailinfo.html">git-mailinfo(1)</a>). Can be activated by default using
  839         the <code>mailinfo.scissors</code> configuration variable.
  840 </p>
  841 </dd>
  842 <dt class="hdlist1">
  843 --no-scissors
  844 </dt>
  845 <dd>
  846 <p>
  847         Ignore scissors lines (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
  848 </p>
  849 </dd>
  850 <dt class="hdlist1">
  851 -m
  852 </dt>
  853 <dt class="hdlist1">
  854 --message-id
  855 </dt>
  856 <dd>
  857 <p>
  858         Pass the <code>-m</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>),
  859         so that the Message-ID header is added to the commit message.
  860         The <code>am.messageid</code> configuration variable can be used to specify
  861         the default behaviour.
  862 </p>
  863 </dd>
  864 <dt class="hdlist1">
  865 --no-message-id
  866 </dt>
  867 <dd>
  868 <p>
  869         Do not add the Message-ID header to the commit message.
  870         <code>no-message-id</code> is useful to override <code>am.messageid</code>.
  871 </p>
  872 </dd>
  873 <dt class="hdlist1">
  874 -q
  875 </dt>
  876 <dt class="hdlist1">
  877 --quiet
  878 </dt>
  879 <dd>
  880 <p>
  881         Be quiet. Only print error messages.
  882 </p>
  883 </dd>
  884 <dt class="hdlist1">
  885 -u
  886 </dt>
  887 <dt class="hdlist1">
  888 --utf8
  889 </dt>
  890 <dd>
  891 <p>
  892         Pass <code>-u</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
  893         The proposed commit log message taken from the e-mail
  894         is re-coded into UTF-8 encoding (configuration variable
  895         <code>i18n.commitencoding</code> can be used to specify project&#8217;s
  896         preferred encoding if it is not UTF-8).
  897 </p>
  898 <div class="paragraph"><p>This was optional in prior versions of git, but now it is the
  899 default.   You can use <code>--no-utf8</code> to override this.</p></div>
  900 </dd>
  901 <dt class="hdlist1">
  902 --no-utf8
  903 </dt>
  904 <dd>
  905 <p>
  906         Pass <code>-n</code> flag to <em>git mailinfo</em> (see
  907         <a href="git-mailinfo.html">git-mailinfo(1)</a>).
  908 </p>
  909 </dd>
  910 <dt class="hdlist1">
  911 -3
  912 </dt>
  913 <dt class="hdlist1">
  914 --3way
  915 </dt>
  916 <dt class="hdlist1">
  917 --no-3way
  918 </dt>
  919 <dd>
  920 <p>
  921         When the patch does not apply cleanly, fall back on
  922         3-way merge if the patch records the identity of blobs
  923         it is supposed to apply to and we have those blobs
  924         available locally. <code>--no-3way</code> can be used to override
  925         am.threeWay configuration variable. For more information,
  926         see am.threeWay in <a href="git-config.html">git-config(1)</a>.
  927 </p>
  928 </dd>
  929 <dt class="hdlist1">
  930 --ignore-space-change
  931 </dt>
  932 <dt class="hdlist1">
  933 --ignore-whitespace
  934 </dt>
  935 <dt class="hdlist1">
  936 --whitespace=&lt;option&gt;
  937 </dt>
  938 <dt class="hdlist1">
  939 -C&lt;n&gt;
  940 </dt>
  941 <dt class="hdlist1">
  942 -p&lt;n&gt;
  943 </dt>
  944 <dt class="hdlist1">
  945 --directory=&lt;dir&gt;
  946 </dt>
  947 <dt class="hdlist1">
  948 --exclude=&lt;path&gt;
  949 </dt>
  950 <dt class="hdlist1">
  951 --include=&lt;path&gt;
  952 </dt>
  953 <dt class="hdlist1">
  954 --reject
  955 </dt>
  956 <dd>
  957 <p>
  958         These flags are passed to the <em>git apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
  959         program that applies
  960         the patch.
  961 </p>
  962 </dd>
  963 <dt class="hdlist1">
  964 --patch-format
  965 </dt>
  966 <dd>
  967 <p>
  968         By default the command will try to detect the patch format
  969         automatically. This option allows the user to bypass the automatic
  970         detection and specify the patch format that the patch(es) should be
  971         interpreted as. Valid formats are mbox, mboxrd,
  972         stgit, stgit-series and hg.
  973 </p>
  974 </dd>
  975 <dt class="hdlist1">
  976 -i
  977 </dt>
  978 <dt class="hdlist1">
  979 --interactive
  980 </dt>
  981 <dd>
  982 <p>
  983         Run interactively.
  984 </p>
  985 </dd>
  986 <dt class="hdlist1">
  987 --committer-date-is-author-date
  988 </dt>
  989 <dd>
  990 <p>
  991         By default the command records the date from the e-mail
  992         message as the commit author date, and uses the time of
  993         commit creation as the committer date. This allows the
  994         user to lie about the committer date by using the same
  995         value as the author date.
  996 </p>
  997 </dd>
  998 <dt class="hdlist1">
  999 --ignore-date
 1000 </dt>
 1001 <dd>
 1002 <p>
 1003         By default the command records the date from the e-mail
 1004         message as the commit author date, and uses the time of
 1005         commit creation as the committer date. This allows the
 1006         user to lie about the author date by using the same
 1007         value as the committer date.
 1008 </p>
 1009 </dd>
 1010 <dt class="hdlist1">
 1011 --skip
 1012 </dt>
 1013 <dd>
 1014 <p>
 1015         Skip the current patch.  This is only meaningful when
 1016         restarting an aborted patch.
 1017 </p>
 1018 </dd>
 1019 <dt class="hdlist1">
 1020 -S[&lt;keyid&gt;]
 1021 </dt>
 1022 <dt class="hdlist1">
 1023 --gpg-sign[=&lt;keyid&gt;]
 1024 </dt>
 1025 <dd>
 1026 <p>
 1027         GPG-sign commits. The <code>keyid</code> argument is optional and
 1028         defaults to the committer identity; if specified, it must be
 1029         stuck to the option without a space.
 1030 </p>
 1031 </dd>
 1032 <dt class="hdlist1">
 1033 --continue
 1034 </dt>
 1035 <dt class="hdlist1">
 1036 -r
 1037 </dt>
 1038 <dt class="hdlist1">
 1039 --resolved
 1040 </dt>
 1041 <dd>
 1042 <p>
 1043         After a patch failure (e.g. attempting to apply
 1044         conflicting patch), the user has applied it by hand and
 1045         the index file stores the result of the application.
 1046         Make a commit using the authorship and commit log
 1047         extracted from the e-mail message and the current index
 1048         file, and continue.
 1049 </p>
 1050 </dd>
 1051 <dt class="hdlist1">
 1052 --resolvemsg=&lt;msg&gt;
 1053 </dt>
 1054 <dd>
 1055 <p>
 1056         When a patch failure occurs, &lt;msg&gt; will be printed
 1057         to the screen before exiting.  This overrides the
 1058         standard message informing you to use <code>--continue</code>
 1059         or <code>--skip</code> to handle the failure.  This is solely
 1060         for internal use between <em>git rebase</em> and <em>git am</em>.
 1061 </p>
 1062 </dd>
 1063 <dt class="hdlist1">
 1064 --abort
 1065 </dt>
 1066 <dd>
 1067 <p>
 1068         Restore the original branch and abort the patching operation.
 1069 </p>
 1070 </dd>
 1071 <dt class="hdlist1">
 1072 --quit
 1073 </dt>
 1074 <dd>
 1075 <p>
 1076         Abort the patching operation but keep HEAD and the index
 1077         untouched.
 1078 </p>
 1079 </dd>
 1080 <dt class="hdlist1">
 1081 --show-current-patch
 1082 </dt>
 1083 <dd>
 1084 <p>
 1085         Show the patch being applied when "git am" is stopped because
 1086         of conflicts.
 1087 </p>
 1088 </dd>
 1089 </dl></div>
 1090 </div>
 1091 </div>
 1092 <div class="sect1">
 1093 <h2 id="_discussion">DISCUSSION</h2>
 1094 <div class="sectionbody">
 1095 <div class="paragraph"><p>The commit author name is taken from the "From: " line of the
 1096 message, and commit author date is taken from the "Date: " line
 1097 of the message.  The "Subject: " line is used as the title of
 1098 the commit, after stripping common prefix "[PATCH &lt;anything&gt;]".
 1099 The "Subject: " line is supposed to concisely describe what the
 1100 commit is about in one line of text.</p></div>
 1101 <div class="paragraph"><p>"From: " and "Subject: " lines starting the body override the respective
 1102 commit author name and title values taken from the headers.</p></div>
 1103 <div class="paragraph"><p>The commit message is formed by the title taken from the
 1104 "Subject: ", a blank line and the body of the message up to
 1105 where the patch begins.  Excess whitespace at the end of each
 1106 line is automatically stripped.</p></div>
 1107 <div class="paragraph"><p>The patch is expected to be inline, directly following the
 1108 message.  Any line that is of the form:</p></div>
 1109 <div class="ulist"><ul>
 1110 <li>
 1111 <p>
 1112 three-dashes and end-of-line, or
 1113 </p>
 1114 </li>
 1115 <li>
 1116 <p>
 1117 a line that begins with "diff -", or
 1118 </p>
 1119 </li>
 1120 <li>
 1121 <p>
 1122 a line that begins with "Index: "
 1123 </p>
 1124 </li>
 1125 </ul></div>
 1126 <div class="paragraph"><p>is taken as the beginning of a patch, and the commit log message
 1127 is terminated before the first occurrence of such a line.</p></div>
 1128 <div class="paragraph"><p>When initially invoking <code>git am</code>, you give it the names of the mailboxes
 1129 to process.  Upon seeing the first patch that does not apply, it
 1130 aborts in the middle.  You can recover from this in one of two ways:</p></div>
 1131 <div class="olist arabic"><ol class="arabic">
 1132 <li>
 1133 <p>
 1134 skip the current patch by re-running the command with the <code>--skip</code>
 1135   option.
 1136 </p>
 1137 </li>
 1138 <li>
 1139 <p>
 1140 hand resolve the conflict in the working directory, and update
 1141   the index file to bring it into a state that the patch should
 1142   have produced.  Then run the command with the <code>--continue</code> option.
 1143 </p>
 1144 </li>
 1145 </ol></div>
 1146 <div class="paragraph"><p>The command refuses to process new mailboxes until the current
 1147 operation is finished, so if you decide to start over from scratch,
 1148 run <code>git am --abort</code> before running the command with mailbox
 1149 names.</p></div>
 1150 <div class="paragraph"><p>Before any patches are applied, ORIG_HEAD is set to the tip of the
 1151 current branch.  This is useful if you have problems with multiple
 1152 commits, like running <em>git am</em> on the wrong branch or an error in the
 1153 commits that is more easily fixed by changing the mailbox (e.g.
 1154 errors in the "From:" lines).</p></div>
 1155 </div>
 1156 </div>
 1157 <div class="sect1">
 1158 <h2 id="_hooks">HOOKS</h2>
 1159 <div class="sectionbody">
 1160 <div class="paragraph"><p>This command can run <code>applypatch-msg</code>, <code>pre-applypatch</code>,
 1161 and <code>post-applypatch</code> hooks.  See <a href="githooks.html">githooks(5)</a> for more
 1162 information.</p></div>
 1163 </div>
 1164 </div>
 1165 <div class="sect1">
 1166 <h2 id="_see_also">SEE ALSO</h2>
 1167 <div class="sectionbody">
 1168 <div class="paragraph"><p><a href="git-apply.html">git-apply(1)</a>.</p></div>
 1169 </div>
 1170 </div>
 1171 <div class="sect1">
 1172 <h2 id="_git">GIT</h2>
 1173 <div class="sectionbody">
 1174 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 1175 </div>
 1176 </div>
 1177 </div>
 1178 <div id="footnotes"><hr /></div>
 1179 <div id="footer">
 1180 <div id="footer-text">
 1181 Last updated
 1182  2018-12-10 16:43:18 JST
 1183 </div>
 1184 </div>
 1185 </body>
 1186 </html>