] [\-C] [\-p]
\&...
\fIgit\-am\fR [\-\-skip | \-\-resolved]
.fi
.SH "DESCRIPTION"
Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch\&.
.SH "OPTIONS"
.PP
\&...
.RS 4
The list of mailbox files to read patches from\&. If you do not supply this argument, reads from the standard input\&.
.RE
.PP
\-\-signoff
.RS 4
Add Signed\-off\-by: line to the commit message, using the committer identity of yourself\&.
.RE
.PP
\-\-dotest=
.RS 4
Instead of \&.dotest directory, use as a working area to store extracted patches\&.
.RE
.PP
\-\-keep
.RS 4
Pass \-k flag to git\-mailinfo (see gitlink:git\-mailinfo[1])\&.
.RE
.PP
\-\-utf8
.RS 4
Pass \-u flag to git\-mailinfo (see gitlink:git\-mailinfo[1])\&. The proposed commit log message taken from the e\-mail are re\-coded into UTF\-8 encoding (configuration variable i18n\&.commitencoding can be used to specify project\(cqs preferred encoding if it is not UTF\-8)\&.
This was optional in prior versions of git, but now it is the default\&. You could use \-\-no\-utf8 to override this\&.
.RE
.PP
\-\-no\-utf8
.RS 4
Do not pass \-u flag to git\-mailinfo (see gitlink:git\-mailinfo[1])\&.
.RE
.PP
\-\-binary
.RS 4
Pass \-\-allow\-binary\-replacement flag to git\-apply (see gitlink:git\-apply[1])\&.
.RE
.PP
\-\-3way
.RS 4
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\&.
.RE
.PP
\-\-skip
.RS 4
Skip the current patch\&. This is only meaningful when restarting an aborted patch\&.
.RE
.PP
\-\-whitespace=

.RS 4
This flag is passed to the git\-apply program that applies the patch\&.
.RE
.PP
\-C, \-p
.RS 4
These flag are passed to the git\-apply program that applies the patch\&.
.RE
.PP
\-\-interactive
.RS 4
Run interactively, just like git\-applymbox\&.
.RE
.PP
\-\-resolved
.RS 4
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\&.
.RE
.SH "DISCUSSION"
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:
.sp
.RS 4
.ie n \{\
\h'-04' 1.\h'+01'\c
.\}
.el \{\
.sp -1
.IP " 1." 4.2
.\}
skip the current one by re\-running the command with \fI\-\-skip\fR option\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04' 2.\h'+01'\c
.\}
.el \{\
.sp -1
.IP " 2." 4.2
.\}
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\&.
.RE
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\&.
.SH "SEE ALSO"
gitlink:git\-applymbox[1], gitlink:git\-applypatch[1], gitlink:git\-apply[1]\&.
.SH "AUTHOR"
Written by Junio C Hamano
.SH "DOCUMENTATION"
Documentation by Petr Baudis, Junio C Hamano and the git\-list \&.
.SH "GIT"
Part of the gitlink:git[7] suite
.SH "NOTES"
.IP " 1." 4
junkio@cox.net
.RS 4
\%mailto:junkio@cox.net
.RE
.IP " 2." 4
git@vger.kernel.org
.RS 4
\%mailto:git@vger.kernel.org
.RE