git-am.html - external/gitster/git-htmldocs - Git at Google

 <!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-am(1)</title>
 </head>
 <body>
 <div id="header">
 <h1>
 git-am(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-am -
  Apply a series of patches in a mailbox
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
 <div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8 | --no-utf8] [--binary] [--3way]
  [--interactive] [--whitespace=&lt;option&gt;] &lt;mbox&gt;&#8230;
 <em>git-am</em> [--skip | --resolved]</div></div>
 </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>
 --signoff
 </dt>
 <dd>
 <p>
  Add <tt>Signed-off-by:</tt> line to the commit message, using
  the committer identity of yourself.
 </p>
 </dd>
 <dt>
 --dotest=&lt;dir&gt;
 </dt>
 <dd>
 <p>
  Instead of <tt>.dotest</tt> directory, use &lt;dir&gt; as a working
  area to store extracted patches.
 </p>
 </dd>
 <dt>
 --keep
 </dt>
 <dd>
 <p>
  Pass <tt>-k</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
 </p>
 </dd>
 <dt>
 --utf8
 </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).
 </p>
 <p>This was optional in prior versions of git, but now it is the
 default. You could use <tt>--no-utf8</tt> to override this.</p>
 </dd>
 <dt>
 --no-utf8
 </dt>
 <dd>
 <p>
  Do not pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see
  <a href="git-mailinfo.html">git-mailinfo(1)</a>).
 </p>
 </dd>
 <dt>
 --binary
 </dt>
 <dd>
 <p>
  Pass <tt>--allow-binary-replacement</tt> flag to <tt>git-apply</tt>
  (see <a href="git-apply.html">git-apply(1)</a>).
 </p>
 </dd>
 <dt>
 --3way
 </dt>
 <dd>
 <p>
  When the patch does not apply cleanly, fall back on
  3-way merge, if the patch records the identity of blobs
  it is supposed to apply to, and we have those blobs
  locally.
 </p>
 </dd>
 <dt>
 --skip
 </dt>
 <dd>
 <p>
  Skip the current patch. This is only meaningful when
  restarting an aborted patch.
 </p>
 </dd>
 <dt>
 --whitespace=&lt;option&gt;
 </dt>
 <dd>
 <p>
  This flag is passed to the <tt>git-apply</tt> program that applies
  the patch.
 </p>
 </dd>
 <dt>
 --interactive
 </dt>
 <dd>
 <p>
  Run interactively, just like git-applymbox.
 </p>
 </dd>
 <dt>
 --resolved
 </dt>
 <dd>
 <p>
  After a patch failure (e.g. attempting to apply
  conflicting patch), the user has applied it by hand and
  the index file stores the result of the application.
  Make a commit using the authorship and commit log
  extracted from the e-mail message and the current index
  file, and continue.
 </p>
 </dd>
 </dl>
 </div>
 <h2>DISCUSSION</h2>
 <div class="sectionbody">
 <p>When initially invoking it, you give it names of the mailboxes
 to crunch. Upon seeing the first patch that does not apply, it
 aborts in the middle, just like <em>git-applymbox</em> does. You can
 recover from this in one of two ways:</p>
 <ol>
 <li>
 <p>
 skip the current one by re-running the command with <em>--skip</em>
  option.
 </p>
 </li>
 <li>
 <p>
 hand resolve the conflict in the working directory, and update
  the index file to bring it in a state that the patch should
  have produced. Then run the command with <em>--resolved</em> option.
 </p>
 </li>
 </ol>
 <p>The command refuses to process new mailboxes while <tt>.dotest</tt>
 directory exists, so if you decide to start over from scratch,
 run <tt>rm -f .dotest</tt> before running the command with mailbox
 names.</p>
 </div>
 <h2>SEE ALSO</h2>
 <div class="sectionbody">
 <p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>, <a href="git-apply.html">git-apply(1)</a>.</p>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <h2>Documentation</h2>
 <div class="sectionbody">
 <p>Documentation by Petr Baudis, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</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 09-Jan-2007 11:13:40 UTC
 </div>
 </div>
 </body>
 </html>
	<!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-am(1)</title>
	</head>
	<body>
	<div id="header">
	<h1>
	git-am(1) Manual Page
	</h1>
	<h2>NAME</h2>
	<div class="sectionbody">
	<p>git-am -
	Apply a series of patches in a mailbox
	</p>
	</div>
	</div>
	<h2>SYNOPSIS</h2>
	<div class="sectionbody">
	<div class="verseblock">
	<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8 \| --no-utf8] [--binary] [--3way]
	[--interactive] [--whitespace=<option>] <mbox>…
	<em>git-am</em> [--skip \| --resolved]</div></div>
	</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>
	--signoff
	</dt>
	<dd>
	<p>
	Add <tt>Signed-off-by:</tt> line to the commit message, using
	the committer identity of yourself.
	</p>
	</dd>
	<dt>
	--dotest=<dir>
	</dt>
	<dd>
	<p>
	Instead of <tt>.dotest</tt> directory, use <dir> as a working
	area to store extracted patches.
	</p>
	</dd>
	<dt>
	--keep
	</dt>
	<dd>
	<p>
	Pass <tt>-k</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
	</p>
	</dd>
	<dt>
	--utf8
	</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).
	</p>
	<p>This was optional in prior versions of git, but now it is the
	default. You could use <tt>--no-utf8</tt> to override this.</p>
	</dd>
	<dt>
	--no-utf8
	</dt>
	<dd>
	<p>
	Do not pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see
	<a href="git-mailinfo.html">git-mailinfo(1)</a>).
	</p>
	</dd>
	<dt>
	--binary
	</dt>
	<dd>
	<p>
	Pass <tt>--allow-binary-replacement</tt> flag to <tt>git-apply</tt>
	(see <a href="git-apply.html">git-apply(1)</a>).
	</p>
	</dd>
	<dt>
	--3way
	</dt>
	<dd>
	<p>
	When the patch does not apply cleanly, fall back on
	3-way merge, if the patch records the identity of blobs
	it is supposed to apply to, and we have those blobs
	locally.
	</p>
	</dd>
	<dt>
	--skip
	</dt>
	<dd>
	<p>
	Skip the current patch. This is only meaningful when
	restarting an aborted patch.
	</p>
	</dd>
	<dt>
	--whitespace=<option>
	</dt>
	<dd>
	<p>
	This flag is passed to the <tt>git-apply</tt> program that applies
	the patch.
	</p>
	</dd>
	<dt>
	--interactive
	</dt>
	<dd>
	<p>
	Run interactively, just like git-applymbox.
	</p>
	</dd>
	<dt>
	--resolved
	</dt>
	<dd>
	<p>
	After a patch failure (e.g. attempting to apply
	conflicting patch), the user has applied it by hand and
	the index file stores the result of the application.
	Make a commit using the authorship and commit log
	extracted from the e-mail message and the current index
	file, and continue.
	</p>
	</dd>
	</dl>
	</div>
	<h2>DISCUSSION</h2>
	<div class="sectionbody">
	<p>When initially invoking it, you give it names of the mailboxes
	to crunch. Upon seeing the first patch that does not apply, it
	aborts in the middle, just like <em>git-applymbox</em> does. You can
	recover from this in one of two ways:</p>
	<ol>
	<li>
	<p>
	skip the current one by re-running the command with <em>--skip</em>
	option.
	</p>
	</li>
	<li>
	<p>
	hand resolve the conflict in the working directory, and update
	the index file to bring it in a state that the patch should
	have produced. Then run the command with <em>--resolved</em> option.
	</p>
	</li>
	</ol>
	<p>The command refuses to process new mailboxes while <tt>.dotest</tt>
	directory exists, so if you decide to start over from scratch,
	run <tt>rm -f .dotest</tt> before running the command with mailbox
	names.</p>
	</div>
	<h2>SEE ALSO</h2>
	<div class="sectionbody">
	<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>, <a href="git-apply.html">git-apply(1)</a>.</p>
	</div>
	<h2>Author</h2>
	<div class="sectionbody">
	<p>Written by Junio C Hamano <junkio@cox.net></p>
	</div>
	<h2>Documentation</h2>
	<div class="sectionbody">
	<p>Documentation by Petr Baudis, 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 09-Jan-2007 11:13:40 UTC
	</div>
	</div>
	</body>
	</html>