| blob | 1095e93050d139b362405acfcd04b4077ab92d8c |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-am(1) Manual Page
407 </h1>
410 <p>git-am -
411 Apply a series of patches from a mailbox
412 </p>
413 </div>
414 </div>
418 <div class="verseblock-content"><em>git am</em> [--signoff] [--keep] [--keep-cr | --no-keep-cr] [--utf8 | --no-utf8]
419 [--3way] [--interactive] [--committer-date-is-author-date]
420 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
422 [--reject] [-q | --quiet] [--scissors | --no-scissors]
426 </div></div>
427 </div>
431 authorship information and patches, and applies them to the
432 current branch.</p></div>
433 </div>
439 </dt>
440 <dd>
441 <p>
442 The list of mailbox files to read patches from. If you do not
443 supply this argument, the command reads from the standard input.
444 If you supply directories, they will be treated as Maildirs.
445 </p>
446 </dd>
448 -s
449 </dt>
451 --signoff
452 </dt>
453 <dd>
454 <p>
456 the committer identity of yourself.
457 </p>
458 </dd>
460 -k
461 </dt>
463 --keep
464 </dt>
465 <dd>
466 <p>
467 Pass <tt>-k</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
468 </p>
469 </dd>
471 --keep-cr
472 </dt>
474 --no-keep-cr
475 </dt>
476 <dd>
477 <p>
478 With <tt>--keep-cr</tt>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>)
479 with the same option, to prevent it from stripping CR at the end of
482 </p>
483 </dd>
485 -c
486 </dt>
488 --scissors
489 </dt>
490 <dd>
491 <p>
492 Remove everything in body before a scissors line (see
494 </p>
495 </dd>
497 --no-scissors
498 </dt>
499 <dd>
500 <p>
502 </p>
503 </dd>
505 -q
506 </dt>
508 --quiet
509 </dt>
510 <dd>
511 <p>
512 Be quiet. Only print error messages.
513 </p>
514 </dd>
516 -u
517 </dt>
519 --utf8
520 </dt>
521 <dd>
522 <p>
523 Pass <tt>-u</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
524 The proposed commit log message taken from the e-mail
525 is re-coded into UTF-8 encoding (configuration variable
527 preferred encoding if it is not UTF-8).
528 </p>
531 </dd>
533 --no-utf8
534 </dt>
535 <dd>
536 <p>
539 </p>
540 </dd>
542 -3
543 </dt>
545 --3way
546 </dt>
547 <dd>
548 <p>
549 When the patch does not apply cleanly, fall back on
550 3-way merge if the patch records the identity of blobs
551 it is supposed to apply to and we have those blobs
552 available locally.
553 </p>
554 </dd>
556 --ignore-date
557 </dt>
559 --ignore-space-change
560 </dt>
562 --ignore-whitespace
563 </dt>
566 </dt>
569 </dt>
572 </dt>
575 </dt>
577 --reject
578 </dt>
579 <dd>
580 <p>
581 These flags are passed to the <em>git apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
582 program that applies
583 the patch.
584 </p>
585 </dd>
587 -i
588 </dt>
590 --interactive
591 </dt>
592 <dd>
593 <p>
594 Run interactively.
595 </p>
596 </dd>
598 --committer-date-is-author-date
599 </dt>
600 <dd>
601 <p>
602 By default the command records the date from the e-mail
603 message as the commit author date, and uses the time of
604 commit creation as the committer date. This allows the
605 user to lie about the committer date by using the same
606 value as the author date.
607 </p>
608 </dd>
610 --ignore-date
611 </dt>
612 <dd>
613 <p>
614 By default the command records the date from the e-mail
615 message as the commit author date, and uses the time of
616 commit creation as the committer date. This allows the
617 user to lie about the author date by using the same
618 value as the committer date.
619 </p>
620 </dd>
622 --skip
623 </dt>
624 <dd>
625 <p>
626 Skip the current patch. This is only meaningful when
627 restarting an aborted patch.
628 </p>
629 </dd>
631 --continue
632 </dt>
634 -r
635 </dt>
637 --resolved
638 </dt>
639 <dd>
640 <p>
641 After a patch failure (e.g. attempting to apply
642 conflicting patch), the user has applied it by hand and
643 the index file stores the result of the application.
644 Make a commit using the authorship and commit log
645 extracted from the e-mail message and the current index
646 file, and continue.
647 </p>
648 </dd>
651 </dt>
652 <dd>
653 <p>
655 to the screen before exiting. This overrides the
659 </p>
660 </dd>
662 --abort
663 </dt>
664 <dd>
665 <p>
666 Restore the original branch and abort the patching operation.
667 </p>
668 </dd>
669 </dl></div>
670 </div>
674 message, and commit author date is taken from the "Date: " line
675 of the message. The "Subject: " line is used as the title of
676 the commit, after stripping common prefix "[PATCH <anything>]".
677 The "Subject: " line is supposed to concisely describe what the
678 commit is about in one line of text.</p></div>
679 <div class="paragraph"><p>"From: " and "Subject: " lines starting the body override the respective
680 commit author name and title values taken from the headers.</p></div>
682 "Subject: ", a blank line and the body of the message up to
683 where the patch begins. Excess whitespace at the end of each
684 line is automatically stripped.</p></div>
686 message. Any line that is of the form:</p></div>
688 <li>
689 <p>
690 three-dashes and end-of-line, or
691 </p>
692 </li>
693 <li>
694 <p>
695 a line that begins with "diff -", or
696 </p>
697 </li>
698 <li>
699 <p>
700 a line that begins with "Index: "
701 </p>
702 </li>
703 </ul></div>
705 is terminated before the first occurrence of such a line.</p></div>
706 <div class="paragraph"><p>When initially invoking <tt>git am</tt>, you give it the names of the mailboxes
707 to process. Upon seeing the first patch that does not apply, it
708 aborts in the middle. You can recover from this in one of two ways:</p></div>
710 <li>
711 <p>
713 option.
714 </p>
715 </li>
716 <li>
717 <p>
718 hand resolve the conflict in the working directory, and update
719 the index file to bring it into a state that the patch should
721 </p>
722 </li>
723 </ol></div>
724 <div class="paragraph"><p>The command refuses to process new mailboxes while the <tt>.git/rebase-apply</tt>
725 directory exists, so if you decide to start over from scratch,
727 names.</p></div>
729 current branch. This is useful if you have problems with multiple
731 commits that is more easily fixed by changing the mailbox (e.g.
733 </div>
737 </div>
740 <div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div>
741 </div>
744 <div class="paragraph"><p>Documentation by Petr Baudis, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
745 </div>
749 </div>
753 </div>
754 </div>
755 </body>
756 </html>