Google Git
Sign in
chromium / external / gitster / git-htmldocs / 9810d63e3fcf38b02b3ccc9191b4807f7825982e / . / git-applymbox.html
blob: 15ef7a13f1ec774e987015f5709d5fc6f7a6782a [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano7ccb9fd2006-07-15 01:38:40[diff] [blame]6<meta name="generator" content="AsciiDoc 7.0.2" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
19a { color: blue; }
20a:visited { color: fuchsia; }
21
22em {
23 font-style: italic;
24}
25
26strong {
27 font-weight: bold;
28}
29
30tt {
31 color: navy;
32}
33
34h1, h2, h3, h4, h5, h6 {
35 color: #527bbd;
36 font-family: sans-serif;
37 margin-top: 1.2em;
38 margin-bottom: 0.5em;
39 line-height: 1.3;
40}
41
42h1 {
43 border-bottom: 2px solid silver;
44}
45h2 {
46 border-bottom: 2px solid silver;
47 padding-top: 0.5em;
48}
49
50div.sectionbody {
51 font-family: serif;
52 margin-left: 0;
53}
54
55hr {
56 border: 1px solid silver;
57}
58
59p {
60 margin-top: 0.5em;
61 margin-bottom: 0.5em;
62}
63
64pre {
65 padding: 0;
66 margin: 0;
67}
68
69span#author {
70 color: #527bbd;
71 font-family: sans-serif;
72 font-weight: bold;
73 font-size: 1.2em;
74}
75span#email {
76}
77span#revision {
78 font-family: sans-serif;
79}
80
81div#footer {
82 font-family: sans-serif;
83 font-size: small;
84 border-top: 2px solid silver;
85 padding-top: 0.5em;
86 margin-top: 4.0em;
87}
88div#footer-text {
89 float: left;
90 padding-bottom: 0.5em;
91}
92div#footer-badges {
93 float: right;
94 padding-bottom: 0.5em;
95}
96
97div#preamble,
98div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
99div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
100div.admonitionblock {
101 margin-right: 10%;
102 margin-top: 1.5em;
103 margin-bottom: 1.5em;
104}
105div.admonitionblock {
106 margin-top: 2.5em;
107 margin-bottom: 2.5em;
108}
109
110div.content { /* Block element content. */
111 padding: 0;
112}
113
114/* Block element titles. */
115div.title, caption.title {
116 font-family: sans-serif;
117 font-weight: bold;
118 text-align: left;
119 margin-top: 1.0em;
120 margin-bottom: 0.5em;
121}
122div.title + * {
123 margin-top: 0;
124}
125
126td div.title:first-child {
127 margin-top: 0.0em;
128}
129div.content div.title:first-child {
130 margin-top: 0.0em;
131}
132div.content + div.title {
133 margin-top: 0.0em;
134}
135
136div.sidebarblock > div.content {
137 background: #ffffee;
138 border: 1px solid silver;
139 padding: 0.5em;
140}
141
142div.listingblock > div.content {
143 border: 1px solid silver;
144 background: #f4f4f4;
145 padding: 0.5em;
146}
147
148div.quoteblock > div.content {
149 padding-left: 2.0em;
150}
151div.quoteblock .attribution {
152 text-align: right;
153}
154
155div.admonitionblock .icon {
156 vertical-align: top;
157 font-size: 1.1em;
158 font-weight: bold;
159 text-decoration: underline;
160 color: #527bbd;
161 padding-right: 0.5em;
162}
163div.admonitionblock td.content {
164 padding-left: 0.5em;
165 border-left: 2px solid silver;
166}
167
168div.exampleblock > div.content {
169 border-left: 2px solid silver;
170 padding: 0.5em;
171}
172
173div.verseblock div.content {
174 white-space: pre;
175}
176
177div.imageblock div.content { padding-left: 0; }
178div.imageblock img { border: 1px solid silver; }
179span.image img { border-style: none; }
180
181dl {
182 margin-top: 0.8em;
183 margin-bottom: 0.8em;
184}
185dt {
186 margin-top: 0.5em;
187 margin-bottom: 0;
188 font-style: italic;
189}
190dd > *:first-child {
191 margin-top: 0;
192}
193
194ul, ol {
195 list-style-position: outside;
196}
197ol.olist2 {
198 list-style-type: lower-alpha;
199}
200
201div.tableblock > table {
202 border-color: #527bbd;
203 border-width: 3px;
204}
205thead {
206 font-family: sans-serif;
207 font-weight: bold;
208}
209tfoot {
210 font-weight: bold;
211}
212
213div.hlist {
214 margin-top: 0.8em;
215 margin-bottom: 0.8em;
216}
217td.hlist1 {
218 vertical-align: top;
219 font-style: italic;
220 padding-right: 0.8em;
221}
222td.hlist2 {
223 vertical-align: top;
224}
225
226@media print {
227 div#footer-badges { display: none; }
228}
229include::./stylesheets/xhtml11-manpage.css[]
230/* Workarounds for IE6's broken and incomplete CSS2. */
231
232div.sidebar-content {
233 background: #ffffee;
234 border: 1px solid silver;
235 padding: 0.5em;
236}
237div.sidebar-title, div.image-title {
238 font-family: sans-serif;
239 font-weight: bold;
240 margin-top: 0.0em;
241 margin-bottom: 0.5em;
242}
243
244div.listingblock div.content {
245 border: 1px solid silver;
246 background: #f4f4f4;
247 padding: 0.5em;
248}
249
250div.quoteblock-content {
251 padding-left: 2.0em;
252}
253
254div.exampleblock-content {
255 border-left: 2px solid silver;
256 padding-left: 0.5em;
257}
258</style>
259<title>git-applymbox(1)</title>
260</head>
261<body>
262<div id="header">
263<h1>
264git-applymbox(1) Manual Page
265</h1>
266<h2>NAME</h2>
267<div class="sectionbody">
268<p>git-applymbox -
269 Apply a series of patches in a mailbox
270</p>
271</div>
272</div>
273<h2>SYNOPSIS</h2>
274<div class="sectionbody">
275<p><em>git-applymbox</em> [-u] [-k] [-q] [-m] ( -c .dotest/&lt;num&gt; | &lt;mbox&gt; ) [ &lt;signoff&gt; ]</p>
276</div>
277<h2>DESCRIPTION</h2>
278<div class="sectionbody">
279<p>Splits mail messages in a mailbox into commit log message,
280authorship information and patches, and applies them to the
281current branch.</p>
282</div>
283<h2>OPTIONS</h2>
284<div class="sectionbody">
285<dl>
286<dt>
287-q
288</dt>
289<dd>
290<p>
291 Apply patches interactively. The user will be given
292 opportunity to edit the log message and the patch before
293 attempting to apply it.
294</p>
295</dd>
296<dt>
297-k
298</dt>
299<dd>
300<p>
301 Usually the program <em>cleans up</em> the Subject: header line
302 to extract the title line for the commit log message,
303 among which (1) remove <em>Re:</em> or <em>re:</em>, (2) leading
304 whitespaces, (3) <em>[</em> up to <em>]</em>, typically <em>[PATCH]</em>, and
305 then prepends "[PATCH] ". This flag forbids this
306 munging, and is most useful when used to read back <em>git
Junio C Hamano0430e3a2007-05-15 03:13:17[diff] [blame]307 format-patch -k</em> output.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]308</p>
309</dd>
310<dt>
311-m
312</dt>
313<dd>
314<p>
315 Patches are applied with <tt>git-apply</tt> command, and unless
316 it cleanly applies without fuzz, the processing fails.
317 With this flag, if a tree that the patch applies cleanly
318 is found in a repository, the patch is applied to the
319 tree and then a 3-way merge between the resulting tree
320 and the current tree.
321</p>
322</dd>
323<dt>
324-u
325</dt>
326<dd>
327<p>
Junio C Hamano0e3cb532007-04-17 08:28:11[diff] [blame]328 Pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
329 The proposed commit log message taken from the e-mail
330 are re-coded into UTF-8 encoding (configuration variable
331 <tt>i18n.commitencoding</tt> can be used to specify project's
332 preferred encoding if it is not UTF-8). This used to be
333 optional but now it is the default.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]334</p>
Junio C Hamano27eacdb2007-01-10 05:37:47[diff] [blame]335<p>Note that the patch is always used as-is without charset
336conversion, even with this flag.</p>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]337</dd>
338<dt>
Junio C Hamano0e3cb532007-04-17 08:28:11[diff] [blame]339-n
340</dt>
341<dd>
342<p>
343 Pass <tt>-n</tt> flag to <tt>git-mailinfo</tt> (see
344 <a href="git-mailinfo.html">git-mailinfo(1)</a>).
345</p>
346</dd>
347<dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]348-c .dotest/&lt;num&gt;
349</dt>
350<dd>
351<p>
352 When the patch contained in an e-mail does not cleanly
353 apply, the command exits with an error message. The
354 patch and extracted message are found in .dotest/, and
355 you could re-run <em>git applymbox</em> with <em>-c .dotest/&lt;num&gt;</em>
356 flag to restart the process after inspecting and fixing
357 them.
358</p>
359</dd>
360<dt>
361&lt;mbox&gt;
362</dt>
363<dd>
364<p>
365 The name of the file that contains the e-mail messages
366 with patches. This file should be in the UNIX mailbox
367 format. See <em>SubmittingPatches</em> document to learn about
368 the formatting convention for e-mail submission.
369</p>
370</dd>
371<dt>
372&lt;signoff&gt;
373</dt>
374<dd>
375<p>
376 The name of the file that contains your "Signed-off-by"
377 line. See <em>SubmittingPatches</em> document to learn what
378 "Signed-off-by" line means. You can also just say
379 <em>yes</em>, <em>true</em>, <em>me</em>, or <em>please</em> to use an automatically
380 generated "Signed-off-by" line based on your committer
381 identity.
382</p>
383</dd>
384</dl>
385</div>
386<h2>SEE ALSO</h2>
387<div class="sectionbody">
388<p><a href="git-am.html">git-am(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>
389</div>
390<h2>Author</h2>
391<div class="sectionbody">
392<p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
393</div>
394<h2>Documentation</h2>
395<div class="sectionbody">
396<p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
397</div>
398<h2>GIT</h2>
399<div class="sectionbody">
400<p>Part of the <a href="git.html">git(7)</a> suite</p>
401</div>
402<div id="footer">
403<div id="footer-text">
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]404Last updated 02-Jun-2007 21:09:23 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]405</div>
406</div>
407</body>
408</html>