.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-APPLYMBOX" "1" "10/03/2006" "" ""
+.TH "GIT\-APPLYMBOX" "1" "01/10/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-applymbox \- Apply a series of patches in a mailbox
.SH "SYNOPSIS"
\fIgit\-applymbox\fR [\-u] [\-k] [\-q] [\-m] ( \-c .dotest/<num> | <mbox> ) [ <signoff> ]
-.sp
.SH "DESCRIPTION"
Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch.
-.sp
.SH "OPTIONS"
.TP
\-q
Apply patches interactively. The user will be given opportunity to edit the log message and the patch before attempting to apply it.
.TP
\-k
-Usually the program
-\fIcleans up\fR
-the Subject: header line to extract the title line for the commit log message, among which (1) remove
-\fIRe:\fR
-or
-\fIre:\fR, (2) leading whitespaces, (3)
-\fI[\fR
-up to
-\fI]\fR, typically
-\fI[PATCH]\fR, and then prepends "[PATCH] ". This flag forbids this munging, and is most useful when used to read back
-\fIgit format\-patch \-\-mbox\fR
-output.
+Usually the program \fIcleans up\fR the Subject: header line to extract the title line for the commit log message, among which (1) remove \fIRe:\fR or \fIre:\fR, (2) leading whitespaces, (3) \fI[\fR up to \fI]\fR, typically \fI[PATCH]\fR, and then prepends "[PATCH] ". This flag forbids this munging, and is most useful when used to read back \fIgit format\-patch \-\-mbox\fR output.
.TP
\-m
-Patches are applied with
-git\-apply
-command, and unless it cleanly applies without fuzz, the processing fails. With this flag, if a tree that the patch applies cleanly is found in a repository, the patch is applied to the tree and then a 3\-way merge between the resulting tree and the current tree.
+Patches are applied with git\-apply command, and unless it cleanly applies without fuzz, the processing fails. With this flag, if a tree that the patch applies cleanly is found in a repository, the patch is applied to the tree and then a 3\-way merge between the resulting tree and the current tree.
.TP
\-u
-By default, the commit log message, author name and author email are taken from the e\-mail without any charset conversion, after minimally decoding MIME transfer encoding. This flag causes the resulting commit to be encoded in utf\-8 by transliterating them. Note that the patch is always used as is without charset conversion, even with this flag.
+The commit log message, author name and author email are taken from the e\-mail, and after minimally decoding MIME transfer encoding, re\-coded in UTF\-8 by transliterating them. This used to be optional but now it is the default.
+
+Note that the patch is always used as\-is without charset conversion, even with this flag.
.TP
\-c .dotest/<num>
-When the patch contained in an e\-mail does not cleanly apply, the command exits with an error message. The patch and extracted message are found in .dotest/, and you could re\-run
-\fIgit applymbox\fR
-with
-\fI\-c .dotest/<num>\fR
-flag to restart the process after inspecting and fixing them.
+When the patch contained in an e\-mail does not cleanly apply, the command exits with an error message. The patch and extracted message are found in .dotest/, and you could re\-run \fIgit applymbox\fR with \fI\-c .dotest/<num>\fR flag to restart the process after inspecting and fixing them.
.TP
<mbox>
-The name of the file that contains the e\-mail messages with patches. This file should be in the UNIX mailbox format. See
-\fISubmittingPatches\fR
-document to learn about the formatting convention for e\-mail submission.
+The name of the file that contains the e\-mail messages with patches. This file should be in the UNIX mailbox format. See \fISubmittingPatches\fR document to learn about the formatting convention for e\-mail submission.
.TP
<signoff>
-The name of the file that contains your "Signed\-off\-by" line. See
-\fISubmittingPatches\fR
-document to learn what "Signed\-off\-by" line means. You can also just say
-\fIyes\fR,
-\fItrue\fR,
-\fIme\fR, or
-\fIplease\fR
-to use an automatically generated "Signed\-off\-by" line based on your committer identity.
+The name of the file that contains your "Signed\-off\-by" line. See \fISubmittingPatches\fR document to learn what "Signed\-off\-by" line means. You can also just say \fIyes\fR, \fItrue\fR, \fIme\fR, or \fIplease\fR to use an automatically generated "Signed\-off\-by" line based on your committer identity.
.SH "SEE ALSO"
\fBgit\-am\fR(1), \fBgit\-applypatch\fR(1).
-.sp
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>
-.sp
.SH "DOCUMENTATION"
Documentation by Junio C Hamano and the git\-list <git@vger.kernel.org>.
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MAILINFO" "1" "10/03/2006" "" ""
+.TH "GIT\-MAILINFO" "1" "01/10/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-mailinfo \- Extracts patch from a single e\-mail message
.SH "SYNOPSIS"
\fIgit\-mailinfo\fR [\-k] [\-u | \-\-encoding=<encoding>] <msg> <patch>
-.sp
.SH "DESCRIPTION"
Reading a single e\-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e\-mail and e\-mail subject are written out to the standard output to be used by git\-applypatch to create a commit. It is usually not necessary to use this command directly.
-.sp
.SH "OPTIONS"
.TP
\-k
-Usually the program
-\fIcleans up\fR
-the Subject: header line to extract the title line for the commit log message, among which (1) remove
-\fIRe:\fR
-or
-\fIre:\fR, (2) leading whitespaces, (3)
-\fI[\fR
-up to
-\fI]\fR, typically
-\fI[PATCH]\fR, and then prepends "[PATCH] ". This flag forbids this munging, and is most useful when used to read back
-\fIgit format\-patch \-\-mbox\fR
-output.
+Usually the program \fIcleans up\fR the Subject: header line to extract the title line for the commit log message, among which (1) remove \fIRe:\fR or \fIre:\fR, (2) leading whitespaces, (3) \fI[\fR up to \fI]\fR, typically \fI[PATCH]\fR, and then prepends "[PATCH] ". This flag forbids this munging, and is most useful when used to read back \fIgit format\-patch \-\-mbox\fR output.
.TP
\-u
-By default, the commit log message, author name and author email are taken from the e\-mail without any charset conversion, after minimally decoding MIME transfer encoding. This flag causes the resulting commit to be encoded in the encoding specified by i18n.commitencoding configuration (defaults to utf\-8) by transliterating them. Note that the patch is always used as is without charset conversion, even with this flag.
+The commit log message, author name and author email are taken from the e\-mail, and after minimally decoding MIME transfer encoding, re\-coded in UTF\-8 by transliterating them. This used to be optional but now it is the default.
+
+Note that the patch is always used as\-is without charset conversion, even with this flag.
.TP
\-\-encoding=<encoding>
Similar to \-u but if the local convention is different from what is specified by i18n.commitencoding, this flag can be used to override it.
The patch extracted from e\-mail.
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
-.sp
.SH "DOCUMENTATION"
Documentation by Junio C Hamano and the git\-list <git@vger.kernel.org>.
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
projects / git.git / commitdiff