| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | |
| "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | |
| <head> | |
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | |
| <meta name="generator" content="AsciiDoc 7.0.2" /> | |
| <style type="text/css"> | |
| /* Debug borders */ | |
| p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { | |
| /* | |
| border: 1px solid red; | |
| */ | |
| } | |
| body { | |
| margin: 1em 5% 1em 5%; | |
| } | |
| a { color: blue; } | |
| a:visited { color: fuchsia; } | |
| em { | |
| font-style: italic; | |
| } | |
| strong { | |
| font-weight: bold; | |
| } | |
| tt { | |
| color: navy; | |
| } | |
| h1, h2, h3, h4, h5, h6 { | |
| color: #527bbd; | |
| font-family: sans-serif; | |
| margin-top: 1.2em; | |
| margin-bottom: 0.5em; | |
| line-height: 1.3; | |
| } | |
| h1 { | |
| border-bottom: 2px solid silver; | |
| } | |
| h2 { | |
| border-bottom: 2px solid silver; | |
| padding-top: 0.5em; | |
| } | |
| div.sectionbody { | |
| font-family: serif; | |
| margin-left: 0; | |
| } | |
| hr { | |
| border: 1px solid silver; | |
| } | |
| p { | |
| margin-top: 0.5em; | |
| margin-bottom: 0.5em; | |
| } | |
| pre { | |
| padding: 0; | |
| margin: 0; | |
| } | |
| span#author { | |
| color: #527bbd; | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| font-size: 1.2em; | |
| } | |
| span#email { | |
| } | |
| span#revision { | |
| font-family: sans-serif; | |
| } | |
| div#footer { | |
| font-family: sans-serif; | |
| font-size: small; | |
| border-top: 2px solid silver; | |
| padding-top: 0.5em; | |
| margin-top: 4.0em; | |
| } | |
| div#footer-text { | |
| float: left; | |
| padding-bottom: 0.5em; | |
| } | |
| div#footer-badges { | |
| float: right; | |
| padding-bottom: 0.5em; | |
| } | |
| div#preamble, | |
| div.tableblock, div.imageblock, div.exampleblock, div.verseblock, | |
| div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, | |
| div.admonitionblock { | |
| margin-right: 10%; | |
| margin-top: 1.5em; | |
| margin-bottom: 1.5em; | |
| } | |
| div.admonitionblock { | |
| margin-top: 2.5em; | |
| margin-bottom: 2.5em; | |
| } | |
| div.content { /* Block element content. */ | |
| padding: 0; | |
| } | |
| /* Block element titles. */ | |
| div.title, caption.title { | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| text-align: left; | |
| margin-top: 1.0em; | |
| margin-bottom: 0.5em; | |
| } | |
| div.title + * { | |
| margin-top: 0; | |
| } | |
| td div.title:first-child { | |
| margin-top: 0.0em; | |
| } | |
| div.content div.title:first-child { | |
| margin-top: 0.0em; | |
| } | |
| div.content + div.title { | |
| margin-top: 0.0em; | |
| } | |
| div.sidebarblock > div.content { | |
| background: #ffffee; | |
| border: 1px solid silver; | |
| padding: 0.5em; | |
| } | |
| div.listingblock > div.content { | |
| border: 1px solid silver; | |
| background: #f4f4f4; | |
| padding: 0.5em; | |
| } | |
| div.quoteblock > div.content { | |
| padding-left: 2.0em; | |
| } | |
| div.quoteblock .attribution { | |
| text-align: right; | |
| } | |
| div.admonitionblock .icon { | |
| vertical-align: top; | |
| font-size: 1.1em; | |
| font-weight: bold; | |
| text-decoration: underline; | |
| color: #527bbd; | |
| padding-right: 0.5em; | |
| } | |
| div.admonitionblock td.content { | |
| padding-left: 0.5em; | |
| border-left: 2px solid silver; | |
| } | |
| div.exampleblock > div.content { | |
| border-left: 2px solid silver; | |
| padding: 0.5em; | |
| } | |
| div.verseblock div.content { | |
| white-space: pre; | |
| } | |
| div.imageblock div.content { padding-left: 0; } | |
| div.imageblock img { border: 1px solid silver; } | |
| span.image img { border-style: none; } | |
| dl { | |
| margin-top: 0.8em; | |
| margin-bottom: 0.8em; | |
| } | |
| dt { | |
| margin-top: 0.5em; | |
| margin-bottom: 0; | |
| font-style: italic; | |
| } | |
| dd > *:first-child { | |
| margin-top: 0; | |
| } | |
| ul, ol { | |
| list-style-position: outside; | |
| } | |
| ol.olist2 { | |
| list-style-type: lower-alpha; | |
| } | |
| div.tableblock > table { | |
| border-color: #527bbd; | |
| border-width: 3px; | |
| } | |
| thead { | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| } | |
| tfoot { | |
| font-weight: bold; | |
| } | |
| div.hlist { | |
| margin-top: 0.8em; | |
| margin-bottom: 0.8em; | |
| } | |
| td.hlist1 { | |
| vertical-align: top; | |
| font-style: italic; | |
| padding-right: 0.8em; | |
| } | |
| td.hlist2 { | |
| vertical-align: top; | |
| } | |
| @media print { | |
| div#footer-badges { display: none; } | |
| } | |
| include::./stylesheets/xhtml11-manpage.css[] | |
| /* Workarounds for IE6's broken and incomplete CSS2. */ | |
| div.sidebar-content { | |
| background: #ffffee; | |
| border: 1px solid silver; | |
| padding: 0.5em; | |
| } | |
| div.sidebar-title, div.image-title { | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| margin-top: 0.0em; | |
| margin-bottom: 0.5em; | |
| } | |
| div.listingblock div.content { | |
| border: 1px solid silver; | |
| background: #f4f4f4; | |
| padding: 0.5em; | |
| } | |
| div.quoteblock-content { | |
| padding-left: 2.0em; | |
| } | |
| div.exampleblock-content { | |
| border-left: 2px solid silver; | |
| padding-left: 0.5em; | |
| } | |
| </style> | |
| <title>git-applymbox(1)</title> | |
| </head> | |
| <body> | |
| <div id="header"> | |
| <h1> | |
| git-applymbox(1) Manual Page | |
| </h1> | |
| <h2>NAME</h2> | |
| <div class="sectionbody"> | |
| <p>git-applymbox - | |
| Apply a series of patches in a mailbox | |
| </p> | |
| </div> | |
| </div> | |
| <h2>SYNOPSIS</h2> | |
| <div class="sectionbody"> | |
| <p><em>git-applymbox</em> [-u] [-k] [-q] [-m] ( -c .dotest/<num> | <mbox> ) [ <signoff> ]</p> | |
| </div> | |
| <h2>DESCRIPTION</h2> | |
| <div class="sectionbody"> | |
| <p>Splits mail messages in a mailbox into commit log message, | |
| authorship information and patches, and applies them to the | |
| current branch.</p> | |
| </div> | |
| <h2>OPTIONS</h2> | |
| <div class="sectionbody"> | |
| <dl> | |
| <dt> | |
| -q | |
| </dt> | |
| <dd> | |
| <p> | |
| Apply patches interactively. The user will be given | |
| opportunity to edit the log message and the patch before | |
| attempting to apply it. | |
| </p> | |
| </dd> | |
| <dt> | |
| -k | |
| </dt> | |
| <dd> | |
| <p> | |
| Usually the program <em>cleans up</em> the Subject: header line | |
| to extract the title line for the commit log message, | |
| among which (1) remove <em>Re:</em> or <em>re:</em>, (2) leading | |
| whitespaces, (3) <em>[</em> up to <em>]</em>, typically <em>[PATCH]</em>, and | |
| then prepends "[PATCH] ". This flag forbids this | |
| munging, and is most useful when used to read back <em>git | |
| format-patch --mbox</em> output. | |
| </p> | |
| </dd> | |
| <dt> | |
| -m | |
| </dt> | |
| <dd> | |
| <p> | |
| Patches are applied with <tt>git-apply</tt> 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. | |
| </p> | |
| </dd> | |
| <dt> | |
| -u | |
| </dt> | |
| <dd> | |
| <p> | |
| Pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). | |
| The proposed commit log message taken from the e-mail | |
| are re-coded into UTF-8 encoding (configuration variable | |
| <tt>i18n.commitencoding</tt> can be used to specify project's | |
| preferred encoding if it is not UTF-8). This used to be | |
| optional but now it is the default. | |
| </p> | |
| <p>Note that the patch is always used as-is without charset | |
| conversion, even with this flag.</p> | |
| </dd> | |
| <dt> | |
| -n | |
| </dt> | |
| <dd> | |
| <p> | |
| Pass <tt>-n</tt> flag to <tt>git-mailinfo</tt> (see | |
| <a href="git-mailinfo.html">git-mailinfo(1)</a>). | |
| </p> | |
| </dd> | |
| <dt> | |
| -c .dotest/<num> | |
| </dt> | |
| <dd> | |
| <p> | |
| 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 <em>git applymbox</em> with <em>-c .dotest/<num></em> | |
| flag to restart the process after inspecting and fixing | |
| them. | |
| </p> | |
| </dd> | |
| <dt> | |
| <mbox> | |
| </dt> | |
| <dd> | |
| <p> | |
| The name of the file that contains the e-mail messages | |
| with patches. This file should be in the UNIX mailbox | |
| format. See <em>SubmittingPatches</em> document to learn about | |
| the formatting convention for e-mail submission. | |
| </p> | |
| </dd> | |
| <dt> | |
| <signoff> | |
| </dt> | |
| <dd> | |
| <p> | |
| The name of the file that contains your "Signed-off-by" | |
| line. See <em>SubmittingPatches</em> document to learn what | |
| "Signed-off-by" line means. You can also just say | |
| <em>yes</em>, <em>true</em>, <em>me</em>, or <em>please</em> to use an automatically | |
| generated "Signed-off-by" line based on your committer | |
| identity. | |
| </p> | |
| </dd> | |
| </dl> | |
| </div> | |
| <h2>SEE ALSO</h2> | |
| <div class="sectionbody"> | |
| <p><a href="git-am.html">git-am(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p> | |
| </div> | |
| <h2>Author</h2> | |
| <div class="sectionbody"> | |
| <p>Written by Linus Torvalds <torvalds@osdl.org></p> | |
| </div> | |
| <h2>Documentation</h2> | |
| <div class="sectionbody"> | |
| <p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p> | |
| </div> | |
| <h2>GIT</h2> | |
| <div class="sectionbody"> | |
| <p>Part of the <a href="git.html">git(7)</a> suite</p> | |
| </div> | |
| <div id="footer"> | |
| <div id="footer-text"> | |
| Last updated 17-Apr-2007 08:27:39 UTC | |
| </div> | |
| </div> | |
| </body> | |
| </html> |