Google Git
Sign in
chromium / external / gitster / git-htmldocs / fbe7486629ec9aeeb001819e3a4b9fb7b756b3e6 / . / git-am.html
blob: 50b025dc7b4ac53303f51418967964c830d17eb8 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]7<title>git-am(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]30 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]35 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]50h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]54 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]90 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]91}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]95 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]121 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 text-align: right;
181}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]182
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]205 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]285
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]293}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]298 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]302}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]314
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]346
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]402 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]429 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]430 padding-left: 0.5em;
431}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var asciidoc = { // Namespace.
440
441/////////////////////////////////////////////////////////////////////
442// Table Of Contents generator
443/////////////////////////////////////////////////////////////////////
444
445/* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
454
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
457
458// toclevels = 1..4.
459toc: function (toclevels) {
460
461 function getText(el) {
462 var text = "";
463 for (var i = el.firstChild; i != null; i = i.nextSibling) {
464 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
465 text += i.data;
466 else if (i.firstChild != null)
467 text += getText(i);
468 }
469 return text;
470 }
471
472 function TocEntry(el, text, toclevel) {
473 this.element = el;
474 this.text = text;
475 this.toclevel = toclevel;
476 }
477
478 function tocEntries(el, toclevels) {
479 var result = new Array;
480 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
484 var iterate = function (el) {
485 for (var i = el.firstChild; i != null; i = i.nextSibling) {
486 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
487 var mo = re.exec(i.tagName);
488 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
489 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
490 }
491 iterate(i);
492 }
493 }
494 }
495 iterate(el);
496 return result;
497 }
498
499 var toc = document.getElementById("toc");
500 var entries = tocEntries(document.getElementById("content"), toclevels);
501 for (var i = 0; i < entries.length; ++i) {
502 var entry = entries[i];
503 if (entry.element.id == "")
504 entry.element.id = "_toc_" + i;
505 var a = document.createElement("a");
506 a.href = "#" + entry.element.id;
507 a.appendChild(document.createTextNode(entry.text));
508 var div = document.createElement("div");
509 div.appendChild(a);
510 div.className = "toclevel" + entry.toclevel;
511 toc.appendChild(div);
512 }
513 if (entries.length == 0)
514 toc.parentNode.removeChild(toc);
515},
516
517
518/////////////////////////////////////////////////////////////////////
519// Footnotes generator
520/////////////////////////////////////////////////////////////////////
521
522/* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
525
526footnotes: function () {
527 var cont = document.getElementById("content");
528 var noteholder = document.getElementById("footnotes");
529 var spans = cont.getElementsByTagName("span");
530 var refs = {};
531 var n = 0;
532 for (i=0; i<spans.length; i++) {
533 if (spans[i].className == "footnote") {
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder.innerHTML +=
539 "<div class='footnote' id='_footnote_" + n + "'>" +
540 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
541 n + "</a>. " + note + "</div>";
542 spans[i].innerHTML =
543 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
544 "' title='View footnote' class='footnote'>" + n + "</a>]";
545 var id =spans[i].getAttribute("id");
546 if (id != null) refs["#"+id] = n;
547 }
548 }
549 if (n == 0)
550 noteholder.parentNode.removeChild(noteholder);
551 else {
552 // Process footnoterefs.
553 for (i=0; i<spans.length; i++) {
554 if (spans[i].className == "footnoteref") {
555 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
556 href = href.match(/#.*/)[0]; // Because IE return full URL.
557 n = refs[href];
558 spans[i].innerHTML =
559 "[<a href='#_footnote_" + n +
560 "' title='View footnote' class='footnote'>" + n + "</a>]";
561 }
562 }
563 }
564}
565
566}
567/*]]>*/
568</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]569</head>
570<body>
571<div id="header">
572<h1>
573git-am(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>git-am -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]578 Apply a series of patches from a mailbox
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]582<div id="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]584<div class="sectionbody">
Junio C Hamano235a91e2006-01-07 01:13:58[diff] [blame]585<div class="verseblock">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]586<div class="verseblock-content"><em>git am</em> [--signoff] [--keep] [--keep-cr | --no-keep-cr] [--utf8 | --no-utf8]
Junio C Hamanoa3bb6eb2009-02-05 01:26:33[diff] [blame]587 [--3way] [--interactive] [--committer-date-is-author-date]
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]588 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
Junio C Hamanocc0cb312009-01-22 03:38:50[diff] [blame]589 [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
Junio C Hamano0c1b64e2012-04-20 23:50:49[diff] [blame]590 [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
Junio C Hamanodac21e72011-08-19 06:50:43[diff] [blame]591 [--scissors | --no-scissors]
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]592 [(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;]
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]593<em>git am</em> (--continue | --skip | --abort)</div>
594<div class="verseblock-attribution">
595</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]596</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]597<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]598<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]599<div class="paragraph"><p>Splits mail messages in a mailbox into commit log message,
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]600authorship information and patches, and applies them to the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]601current branch.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]602</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]603<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]604<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]605<div class="dlist"><dl>
606<dt class="hdlist1">
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]607(&lt;mbox&gt;|&lt;Maildir&gt;)&#8230;
Junio C Hamano9cb74f22007-02-12 04:15:05[diff] [blame]608</dt>
609<dd>
610<p>
611 The list of mailbox files to read patches from. If you do not
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]612 supply this argument, the command reads from the standard input.
613 If you supply directories, they will be treated as Maildirs.
Junio C Hamano9cb74f22007-02-12 04:15:05[diff] [blame]614</p>
615</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]616<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]617-s
618</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]619<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]620--signoff
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]621</dt>
622<dd>
623<p>
Junio C Hamano86f31572009-05-06 07:38:42[diff] [blame]624 Add a <tt>Signed-off-by:</tt> line to the commit message, using
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]625 the committer identity of yourself.
626</p>
627</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]628<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]629-k
630</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]631<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]632--keep
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]633</dt>
634<dd>
635<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]636 Pass <tt>-k</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
Junio C Hamano1d3a6c72007-01-09 11:13:47[diff] [blame]637</p>
638</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]639<dt class="hdlist1">
Junio C Hamanob5be0522012-01-29 22:20:19[diff] [blame]640--keep-non-patch
641</dt>
642<dd>
643<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]644 Pass <tt>-b</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
Junio C Hamanob5be0522012-01-29 22:20:19[diff] [blame]645</p>
646</dd>
647<dt class="hdlist1">
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]648--keep-cr
649</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]650<dt class="hdlist1">
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]651--no-keep-cr
652</dt>
653<dd>
654<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]655 With <tt>--keep-cr</tt>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>)
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]656 with the same option, to prevent it from stripping CR at the end of
657 lines. <tt>am.keepcr</tt> configuration variable can be used to specify the
658 default behaviour. <tt>--no-keep-cr</tt> is useful to override <tt>am.keepcr</tt>.
659</p>
660</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]661<dt class="hdlist1">
Junio C Hamanoc28068f2009-09-08 00:55:23[diff] [blame]662-c
663</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]664<dt class="hdlist1">
Junio C Hamanoc28068f2009-09-08 00:55:23[diff] [blame]665--scissors
666</dt>
667<dd>
668<p>
669 Remove everything in body before a scissors line (see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]670 <a href="git-mailinfo.html">git-mailinfo(1)</a>).
Junio C Hamanoc28068f2009-09-08 00:55:23[diff] [blame]671</p>
672</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]673<dt class="hdlist1">
Junio C Hamano01f1fbd2010-03-05 07:36:41[diff] [blame]674--no-scissors
Junio C Hamanocf5b7732009-09-11 23:28:32[diff] [blame]675</dt>
676<dd>
677<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]678 Ignore scissors lines (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
Junio C Hamanocf5b7732009-09-11 23:28:32[diff] [blame]679</p>
680</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]681<dt class="hdlist1">
Junio C Hamano2c14c8d2009-07-02 03:17:00[diff] [blame]682-q
683</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]684<dt class="hdlist1">
Junio C Hamano2c14c8d2009-07-02 03:17:00[diff] [blame]685--quiet
686</dt>
687<dd>
688<p>
689 Be quiet. Only print error messages.
690</p>
691</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]692<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]693-u
694</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]695<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]696--utf8
Junio C Hamano1d3a6c72007-01-09 11:13:47[diff] [blame]697</dt>
698<dd>
699<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]700 Pass <tt>-u</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
Junio C Hamano1d3a6c72007-01-09 11:13:47[diff] [blame]701 The proposed commit log message taken from the e-mail
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]702 is re-coded into UTF-8 encoding (configuration variable
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]703 <tt>i18n.commitencoding</tt> can be used to specify project&#8217;s
Junio C Hamano1d3a6c72007-01-09 11:13:47[diff] [blame]704 preferred encoding if it is not UTF-8).
705</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]706<div class="paragraph"><p>This was optional in prior versions of git, but now it is the
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]707default. You can use <tt>--no-utf8</tt> to override this.</p></div>
Junio C Hamano1d3a6c72007-01-09 11:13:47[diff] [blame]708</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]709<dt class="hdlist1">
Junio C Hamano1d3a6c72007-01-09 11:13:47[diff] [blame]710--no-utf8
711</dt>
712<dd>
713<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]714 Pass <tt>-n</tt> flag to <em>git mailinfo</em> (see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]715 <a href="git-mailinfo.html">git-mailinfo(1)</a>).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]716</p>
717</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]718<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]719-3
720</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]721<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]722--3way
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]723</dt>
724<dd>
725<p>
726 When the patch does not apply cleanly, fall back on
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]727 3-way merge if the patch records the identity of blobs
728 it is supposed to apply to and we have those blobs
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]729 available locally.
730</p>
731</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]732<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]733--ignore-date
734</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]735<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]736--ignore-space-change
737</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]738<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]739--ignore-whitespace
740</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]741<dt class="hdlist1">
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]742--whitespace=&lt;option&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]743</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]744<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]745-C&lt;n&gt;
746</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]747<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]748-p&lt;n&gt;
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]749</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]750<dt class="hdlist1">
Junio C Hamanocc0cb312009-01-22 03:38:50[diff] [blame]751--directory=&lt;dir&gt;
752</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]753<dt class="hdlist1">
Junio C Hamanodac21e72011-08-19 06:50:43[diff] [blame]754--exclude=&lt;path&gt;
755</dt>
756<dt class="hdlist1">
Junio C Hamano0c1b64e2012-04-20 23:50:49[diff] [blame]757--include=&lt;path&gt;
758</dt>
759<dt class="hdlist1">
Junio C Hamano22bcc112009-01-24 08:05:18[diff] [blame]760--reject
761</dt>
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]762<dd>
763<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]764 These flags are passed to the <em>git apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]765 program that applies
766 the patch.
767</p>
768</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]769<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]770-i
771</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]772<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]773--interactive
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]774</dt>
775<dd>
776<p>
777 Run interactively.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]778</p>
779</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]780<dt class="hdlist1">
Junio C Hamanoa3bb6eb2009-02-05 01:26:33[diff] [blame]781--committer-date-is-author-date
782</dt>
783<dd>
784<p>
785 By default the command records the date from the e-mail
786 message as the commit author date, and uses the time of
787 commit creation as the committer date. This allows the
788 user to lie about the committer date by using the same
Junio C Hamano86f31572009-05-06 07:38:42[diff] [blame]789 value as the author date.
Junio C Hamanoa3bb6eb2009-02-05 01:26:33[diff] [blame]790</p>
791</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]792<dt class="hdlist1">
Junio C Hamanoa3bb6eb2009-02-05 01:26:33[diff] [blame]793--ignore-date
794</dt>
795<dd>
796<p>
797 By default the command records the date from the e-mail
798 message as the commit author date, and uses the time of
799 commit creation as the committer date. This allows the
Junio C Hamano86f31572009-05-06 07:38:42[diff] [blame]800 user to lie about the author date by using the same
801 value as the committer date.
Junio C Hamanoa3bb6eb2009-02-05 01:26:33[diff] [blame]802</p>
803</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]804<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]805--skip
806</dt>
807<dd>
808<p>
809 Skip the current patch. This is only meaningful when
810 restarting an aborted patch.
811</p>
812</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]813<dt class="hdlist1">
Junio C Hamanob2628b12010-02-12 08:08:08[diff] [blame]814--continue
815</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]816<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]817-r
818</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]819<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]820--resolved
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]821</dt>
822<dd>
823<p>
824 After a patch failure (e.g. attempting to apply
825 conflicting patch), the user has applied it by hand and
826 the index file stores the result of the application.
827 Make a commit using the authorship and commit log
828 extracted from the e-mail message and the current index
829 file, and continue.
830</p>
831</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]832<dt class="hdlist1">
Junio C Hamano0e3cb532007-04-17 08:28:11[diff] [blame]833--resolvemsg=&lt;msg&gt;
834</dt>
835<dd>
836<p>
837 When a patch failure occurs, &lt;msg&gt; will be printed
838 to the screen before exiting. This overrides the
839 standard message informing you to use <tt>--resolved</tt>
840 or <tt>--skip</tt> to handle the failure. This is solely
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]841 for internal use between <em>git rebase</em> and <em>git am</em>.
Junio C Hamano0e3cb532007-04-17 08:28:11[diff] [blame]842</p>
843</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]844<dt class="hdlist1">
Junio C Hamano5ba2c222008-07-21 04:33:46[diff] [blame]845--abort
846</dt>
847<dd>
848<p>
849 Restore the original branch and abort the patching operation.
850</p>
851</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]852</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]853</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]854<h2 id="_discussion">DISCUSSION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]855<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]856<div class="paragraph"><p>The commit author name is taken from the "From: " line of the
Junio C Hamano86f31572009-05-06 07:38:42[diff] [blame]857message, and commit author date is taken from the "Date: " line
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]858of the message. The "Subject: " line is used as the title of
859the commit, after stripping common prefix "[PATCH &lt;anything&gt;]".
Junio C Hamano86f31572009-05-06 07:38:42[diff] [blame]860The "Subject: " line is supposed to concisely describe what the
861commit is about in one line of text.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]862<div class="paragraph"><p>"From: " and "Subject: " lines starting the body override the respective
Junio C Hamanoc28068f2009-09-08 00:55:23[diff] [blame]863commit author name and title values taken from the headers.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]864<div class="paragraph"><p>The commit message is formed by the title taken from the
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]865"Subject: ", a blank line and the body of the message up to
Junio C Hamano86f31572009-05-06 07:38:42[diff] [blame]866where the patch begins. Excess whitespace at the end of each
867line is automatically stripped.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]868<div class="paragraph"><p>The patch is expected to be inline, directly following the
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]869message. Any line that is of the form:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]870<div class="ulist"><ul>
Junio C Hamano35e57552007-03-25 07:54:35[diff] [blame]871<li>
872<p>
873three-dashes and end-of-line, or
874</p>
875</li>
876<li>
877<p>
878a line that begins with "diff -", or
879</p>
880</li>
881<li>
882<p>
883a line that begins with "Index: "
884</p>
885</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]886</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]887<div class="paragraph"><p>is taken as the beginning of a patch, and the commit log message
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]888is terminated before the first occurrence of such a line.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]889<div class="paragraph"><p>When initially invoking <tt>git am</tt>, you give it the names of the mailboxes
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]890to process. Upon seeing the first patch that does not apply, it
891aborts in the middle. You can recover from this in one of two ways:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]892<div class="olist arabic"><ol class="arabic">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]893<li>
894<p>
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]895skip the current patch by re-running the command with the <em>--skip</em>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]896 option.
897</p>
898</li>
899<li>
900<p>
901hand resolve the conflict in the working directory, and update
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]902 the index file to bring it into a state that the patch should
903 have produced. Then run the command with the <em>--resolved</em> option.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]904</p>
905</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]906</ol></div>
Junio C Hamano78f25df2011-03-23 00:05:35[diff] [blame]907<div class="paragraph"><p>The command refuses to process new mailboxes until the current
908operation is finished, so if you decide to start over from scratch,
909run <tt>git am --abort</tt> before running the command with mailbox
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]910names.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]911<div class="paragraph"><p>Before any patches are applied, ORIG_HEAD is set to the tip of the
Junio C Hamano38ddcce2008-07-15 15:49:03[diff] [blame]912current branch. This is useful if you have problems with multiple
913commits, like running <em>git am</em> on the wrong branch or an error in the
914commits that is more easily fixed by changing the mailbox (e.g.
915errors in the "From:" lines).</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]916</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]917<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]918<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]919<div class="paragraph"><p><a href="git-apply.html">git-apply(1)</a>.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]920</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]921<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]922<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]923<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]924</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]925</div>
926<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]927<div id="footer">
928<div id="footer-text">
Junio C Hamano719b8a32012-06-08 18:40:53[diff] [blame]929Last updated 2012-04-29 17:26:43 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]930</div>
931</div>
932</body>
933</html>