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