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-am(1)</title>
\r
264 git-am(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 <div class="verseblock">
\r
276 <div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>…
\r
277 <em>git-am</em> [--skip | --resolved]</div></div>
\r
279 <h2>DESCRIPTION</h2>
\r
280 <div class="sectionbody">
\r
281 <p>Splits mail messages in a mailbox into commit log message,
\r
282 authorship information and patches, and applies them to the
\r
283 current branch.</p>
\r
286 <div class="sectionbody">
\r
293 Add <tt>Signed-off-by:</tt> line to the commit message, using
\r
294 the committer identity of yourself.
\r
298 --dotest=<dir>
\r
302 Instead of <tt>.dotest</tt> directory, use <dir> as a working
\r
303 area to store extracted patches.
\r
311 Pass <tt>-u</tt> and <tt>-k</tt> flags to <tt>git-mailinfo</tt> (see
\r
312 <a href="git-mailinfo.html">git-mailinfo(1)</a>).
\r
320 Pass <tt>--allow-binary-replacement</tt> flag to <tt>git-apply</tt>
\r
321 (see <a href="git-apply.html">git-apply(1)</a>).
\r
329 When the patch does not apply cleanly, fall back on
\r
330 3-way merge, if the patch records the identity of blobs
\r
331 it is supposed to apply to, and we have those blobs
\r
340 Skip the current patch. This is only meaningful when
\r
341 restarting an aborted patch.
\r
349 Run interactively, just like git-applymbox.
\r
357 After a patch failure (e.g. attempting to apply
\r
358 conflicting patch), the user has applied it by hand and
\r
359 the index file stores the result of the application.
\r
360 Make a commit using the authorship and commit log
\r
361 extracted from the e-mail message and the current index
\r
362 file, and continue.
\r
367 <h2>DISCUSSION</h2>
\r
368 <div class="sectionbody">
\r
369 <p>When initially invoking it, you give it names of the mailboxes
\r
370 to crunch. Upon seeing the first patch that does not apply, it
\r
371 aborts in the middle, just like <em>git-applymbox</em> does. You can
\r
372 recover from this in one of two ways:</p>
\r
376 skip the current one by re-running the command with <em>--skip</em>
\r
382 hand resolve the conflict in the working directory, and update
\r
383 the index file to bring it in a state that the patch should
\r
384 have produced. Then run the command with <em>--resolved</em> option.
\r
388 <p>The command refuses to process new mailboxes while <tt>.dotest</tt>
\r
389 directory exists, so if you decide to start over from scratch,
\r
390 run <tt>rm -f .dotest</tt> before running the command with mailbox
\r
394 <div class="sectionbody">
\r
395 <p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>
\r
398 <div class="sectionbody">
\r
399 <p>Written by Junio C Hamano <junkio@cox.net></p>
\r
401 <h2>Documentation</h2>
\r
402 <div class="sectionbody">
\r
403 <p>Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
406 <div class="sectionbody">
\r
407 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
410 <div id="footer-text">
\r
411 Last updated 06-Jan-2006 17:11:59 PDT
\r