1 .\"Generated by db2man.xsl. Don't modify this, modify the source.
10 .de Sp \" Vertical space (when we can't use .PP)
16 .ie \\n(.$>=3 .ne \\$3
20 .TH "GIT-AM" 1 "" "" ""
22 git-am \- Apply a series of patches in a mailbox
26 \fIgit\-am\fR [\-\-signoff] [\-\-dotest=<dir>] [\-\-utf8] [\-\-binary] [\-\-3way]
27 [\-\-interactive] [\-\-whitespace=<option>] <mbox>...
28 \fIgit\-am\fR [\-\-skip | \-\-resolved]
34 Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch\&.
40 Add Signed\-off\-by: line to the commit message, using the committer identity of yourself\&.
44 Instead of \&.dotest directory, use <dir> as a working area to store extracted patches\&.
48 Pass \-u and \-k flags to git\-mailinfo (see \fBgit\-mailinfo\fR(1))\&.
52 Pass \-\-allow\-binary\-replacement flag to git\-apply (see \fBgit\-apply\fR(1))\&.
56 When the patch does not apply cleanly, fall back on 3\-way merge, if the patch records the identity of blobs it is supposed to apply to, and we have those blobs locally\&.
60 Skip the current patch\&. This is only meaningful when restarting an aborted patch\&.
63 \-\-whitespace=<option>
64 This flag is passed to the git\-apply program that applies the patch\&.
68 Run interactively, just like git\-applymbox\&.
72 After a patch failure (e\&.g\&. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application\&. Make a commit using the authorship and commit log extracted from the e\-mail message and the current index file, and continue\&.
77 When initially invoking it, you give it names of the mailboxes to crunch\&. Upon seeing the first patch that does not apply, it aborts in the middle, just like \fIgit\-applymbox\fR does\&. You can recover from this in one of two ways:
81 skip the current one by re\-running the command with \fI\-\-skip\fR option\&.
84 hand resolve the conflict in the working directory, and update the index file to bring it in a state that the patch should have produced\&. Then run the command with \fI\-\-resolved\fR option\&.
88 The command refuses to process new mailboxes while \&.dotest directory exists, so if you decide to start over from scratch, run rm \-f \&.dotest before running the command with mailbox names\&.
93 \fBgit\-applymbox\fR(1), \fBgit\-applypatch\fR(1), \fBgit\-apply\fR(1)\&.
98 Written by Junio C Hamano <junkio@cox\&.net>
103 Documentation by Petr Baudis, Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
108 Part of the \fBgit\fR(7) suite