1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-applymbox(1)</title>
\r
264 git-applymbox(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Apply a series of patches in a mailbox
\r
274 <div class="sectionbody">
\r
275 <p><em>git-applymbox</em> [-u] [-k] [-q] [-m] ( -c .dotest/<num> | <mbox> ) [ <signoff> ]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Splits mail messages in a mailbox into commit log message,
\r
280 authorship information and patches, and applies them to the
\r
281 current branch.</p>
\r
284 <div class="sectionbody">
\r
291 Apply patches interactively. The user will be given
\r
292 opportunity to edit the log message and the patch before
\r
293 attempting to apply it.
\r
301 Usually the program <em>cleans up</em> the Subject: header line
\r
302 to extract the title line for the commit log message,
\r
303 among which (1) remove <em>Re:</em> or <em>re:</em>, (2) leading
\r
304 whitespaces, (3) <em>[</em> up to <em>]</em>, typically <em>[PATCH]</em>, and
\r
305 then prepends "[PATCH] ". This flag forbids this
\r
306 munging, and is most useful when used to read back <em>git
\r
307 format-patch --mbox</em> output.
\r
315 Patches are applied with <tt>git-apply</tt> command, and unless
\r
316 it cleanly applies without fuzz, the processing fails.
\r
317 With this flag, if a tree that the patch applies cleanly
\r
318 is found in a repository, the patch is applied to the
\r
319 tree and then a 3-way merge between the resulting tree
\r
320 and the current tree.
\r
328 By default, the commit log message, author name and
\r
329 author email are taken from the e-mail without any
\r
330 charset conversion, after minimally decoding MIME
\r
331 transfer encoding. This flag causes the resulting
\r
332 commit to be encoded in utf-8 by transliterating them.
\r
333 Note that the patch is always used as is without charset
\r
334 conversion, even with this flag.
\r
338 -c .dotest/<num>
\r
342 When the patch contained in an e-mail does not cleanly
\r
343 apply, the command exits with an error message. The
\r
344 patch and extracted message are found in .dotest/, and
\r
345 you could re-run <em>git applymbox</em> with <em>-c .dotest/<num></em>
\r
346 flag to restart the process after inspecting and fixing
\r
355 The name of the file that contains the e-mail messages
\r
356 with patches. This file should be in the UNIX mailbox
\r
357 format. See <em>SubmittingPatches</em> document to learn about
\r
358 the formatting convention for e-mail submission.
\r
366 The name of the file that contains your "Signed-off-by"
\r
367 line. See <em>SubmittingPatches</em> document to learn what
\r
368 "Signed-off-by" line means. You can also just say
\r
369 <em>yes</em>, <em>true</em>, <em>me</em>, or <em>please</em> to use an automatically
\r
370 generated "Signed-off-by" line based on your committer
\r
377 <div class="sectionbody">
\r
378 <p><a href="git-am.html">git-am(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>
\r
381 <div class="sectionbody">
\r
382 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
384 <h2>Documentation</h2>
\r
385 <div class="sectionbody">
\r
386 <p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
389 <div class="sectionbody">
\r
390 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
393 <div id="footer-text">
\r
394 Last updated 27-Dec-2005 00:15:46 PDT
\r