Autogenerated HTML docs for v1.5.6.2-212-g08b5

author: Junio C Hamano <junio@hera.kernel.org> 2008-07-06 05:20:31 +0000
committer: Junio C Hamano <junio@hera.kernel.org> 2008-07-06 05:20:31 +0000
commit: ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch)
tree: 390507328a7564b65dc803683c34235700b97409 /git-am.html
parent: 05bf9c54a827e48b2b576488f5170a3490b5180e (diff)
download: git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz
1 files changed, 102 insertions, 54 deletions
diff --git a/git-am.html b/git-am.html
index 830ba2789..7fcfa1333 100644
--- a/git-am.html
+++ b/git-am.html
@@ -3,7 +3,7 @@
 <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" />
+<meta name="generator" content="AsciiDoc 8.2.5" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -16,8 +16,13 @@ body {
   margin: 1em 5% 1em 5%;
 }
 
-a { color: blue; }
-a:visited { color: fuchsia; }
+a {
+  color: blue;
+  text-decoration: underline;
+}
+a:visited {
+  color: fuchsia;
+}
 
 em {
   font-style: italic;
@@ -39,13 +44,18 @@ h1, h2, h3, h4, h5, h6 {
   line-height: 1.3;
 }
 
-h1 {
+h1, h2, h3 {
   border-bottom: 2px solid silver;
 }
 h2 {
-  border-bottom: 2px solid silver;
   padding-top: 0.5em;
 }
+h3 {
+  float: left;
+}
+h3 + * {
+  clear: left;
+}
 
 div.sectionbody {
   font-family: serif;
@@ -70,7 +80,7 @@ span#author {
   color: #527bbd;
   font-family: sans-serif;
   font-weight: bold;
-  font-size: 1.2em;
+  font-size: 1.1em;
 }
 span#email {
 }
@@ -139,6 +149,9 @@ div.sidebarblock > div.content {
   padding: 0.5em;
 }
 
+div.listingblock {
+  margin-right: 0%;
+}
 div.listingblock > div.content {
   border: 1px solid silver;
   background: #f4f4f4;
@@ -148,9 +161,13 @@ div.listingblock > div.content {
 div.quoteblock > div.content {
   padding-left: 2.0em;
 }
-div.quoteblock .attribution {
+
+div.attribution {
   text-align: right;
 }
+div.verseblock + div.attribution {
+  text-align: left;
+}
 
 div.admonitionblock .icon {
   vertical-align: top;
@@ -194,13 +211,12 @@ dd > *:first-child {
 ul, ol {
     list-style-position: outside;
 }
-ol.olist2 {
+div.olist2 ol {
   list-style-type: lower-alpha;
 }
 
 div.tableblock > table {
-  border-color: #527bbd;
-  border-width: 3px;
+  border: 3px solid #527bbd;
 }
 thead {
   font-family: sans-serif;
@@ -214,6 +230,9 @@ div.hlist {
   margin-top: 0.8em;
   margin-bottom: 0.8em;
 }
+div.hlist td {
+  padding-bottom: 5px;
+}
 td.hlist1 {
   vertical-align: top;
   font-style: italic;
@@ -226,7 +245,33 @@ td.hlist2 {
 @media print {
   div#footer-badges { display: none; }
 }
-include::./stylesheets/xhtml11-manpage.css[]
+
+div#toctitle {
+  color: #527bbd;
+  font-family: sans-serif;
+  font-size: 1.1em;
+  font-weight: bold;
+  margin-top: 1.0em;
+  margin-bottom: 0.1em;
+}
+
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+div.toclevel2 {
+  margin-left: 2em;
+  font-size: 0.9em;
+}
+div.toclevel3 {
+  margin-left: 4em;
+  font-size: 0.9em;
+}
+div.toclevel4 {
+  margin-left: 6em;
+  font-size: 0.9em;
+}
+include1::./stylesheets/xhtml11-manpage.css[]
 /* Workarounds for IE6's broken and incomplete CSS2. */
 
 div.sidebar-content {
@@ -255,6 +300,9 @@ div.exampleblock-content {
   border-left: 2px solid silver;
   padding-left: 0.5em;
 }
+
+/* IE6 sets dynamically generated links as visited. */
+div#toc a:visited { color: blue; }
 </style>
 <title>git-am(1)</title>
 </head>
@@ -279,15 +327,15 @@ git-am(1) Manual Page
          &lt;mbox&gt;|&lt;Maildir&gt;&#8230;
 <em>git am</em> [--skip | --resolved]</div></div>
 </div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<p>Splits mail messages in a mailbox into commit log message,
+<div class="para"><p>Splits mail messages in a mailbox into commit log message,
 authorship information and patches, and applies them to the
-current branch.</p>
+current branch.</p></div>
 </div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
 <dt>
 &lt;mbox&gt;|&lt;Maildir&gt;&#8230;
 </dt>
@@ -318,7 +366,7 @@ current branch.</p>
 </dt>
 <dd>
 <p>
-        Pass <tt>-k</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
+        Pass <tt>-k</tt> flag to <em>git-mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
 </p>
 </dd>
 <dt>
@@ -329,21 +377,21 @@ current branch.</p>
 </dt>
 <dd>
 <p>
-        Pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
+        Pass <tt>-u</tt> flag to <em>git-mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
         The proposed commit log message taken from the e-mail
         is 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>
+<div class="para"><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></div>
 </dd>
 <dt>
 --no-utf8
 </dt>
 <dd>
 <p>
-        Pass <tt>-n</tt> flag to <tt>git-mailinfo</tt> (see
+        Pass <tt>-n</tt> flag to <em>git-mailinfo</em> (see
         <a href="git-mailinfo.html">git-mailinfo(1)</a>).
 </p>
 </dd>
@@ -369,7 +417,7 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </dt>
 <dd>
 <p>
-        Pass <tt>--allow-binary-replacement</tt> flag to <tt>git-apply</tt>
+        Pass <tt>--allow-binary-replacement</tt> flag to <em>git-apply</em>
         (see <a href="git-apply.html">git-apply(1)</a>).
 </p>
 </dd>
@@ -378,7 +426,7 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </dt>
 <dd>
 <p>
-        This flag is passed to the <tt>git-apply</tt> (see <a href="git-apply.html">git-apply(1)</a>)
+        This flag is passed to the <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
         program that applies
         the patch.
 </p>
@@ -391,7 +439,7 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </dt>
 <dd>
 <p>
-        These flags are passed to the <tt>git-apply</tt> (see <a href="git-apply.html">git-apply(1)</a>)
+        These flags are passed to the <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
         program that applies
         the patch.
 </p>
@@ -441,30 +489,30 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
         to the screen before exiting.  This overrides the
         standard message informing you to use <tt>--resolved</tt>
         or <tt>--skip</tt> to handle the failure.  This is solely
-        for internal use between <tt>git-rebase</tt> and <tt>git-am</tt>.
+        for internal use between <em>git-rebase</em> and <em>git-am</em>.
 </p>
 </dd>
-</dl>
+</dl></div>
 </div>
-<h2>DISCUSSION</h2>
+<h2 id="_discussion">DISCUSSION</h2>
 <div class="sectionbody">
-<p>The commit author name is taken from the "From: " line of the
+<div class="para"><p>The commit author name is taken from the "From: " line of the
 message, and commit author time is taken from the "Date: " line
 of the message.  The "Subject: " line is used as the title of
 the commit, after stripping common prefix "[PATCH &lt;anything&gt;]".
 It is supposed to describe what the commit is about concisely as
-a one line text.</p>
-<p>The body of the message (iow, after a blank line that terminates
+a one line text.</p></div>
+<div class="para"><p>The body of the message (iow, after a blank line that terminates
 RFC2822 headers) can begin with "Subject: " and "From: " lines
 that are different from those of the mail header, to override
-the values of these fields.</p>
-<p>The commit message is formed by the title taken from the
+the values of these fields.</p></div>
+<div class="para"><p>The commit message is formed by the title taken from the
 "Subject: ", a blank line and the body of the message up to
 where the patch begins.  Excess whitespaces at the end of the
-lines are automatically stripped.</p>
-<p>The patch is expected to be inline, directly following the
-message.  Any line that is of form:</p>
-<ul>
+lines are automatically stripped.</p></div>
+<div class="para"><p>The patch is expected to be inline, directly following the
+message.  Any line that is of form:</p></div>
+<div class="ilist"><ul>
 <li>
 <p>
 three-dashes and end-of-line, or
@@ -480,13 +528,13 @@ a line that begins with "diff -", or
 a line that begins with "Index: "
 </p>
 </li>
-</ul>
-<p>is taken as the beginning of a patch, and the commit log message
-is terminated before the first occurrence of such a line.</p>
-<p>When initially invoking it, you give it names of the mailboxes
+</ul></div>
+<div class="para"><p>is taken as the beginning of a patch, and the commit log message
+is terminated before the first occurrence of such a line.</p></div>
+<div class="para"><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,.  You can recover from this in one of two ways:</p>
-<ol>
+aborts in the middle,.  You can recover from this in one of two ways:</p></div>
+<div class="olist"><ol>
 <li>
 <p>
 skip the current patch by re-running the command with <em>--skip</em>
@@ -500,31 +548,31 @@ hand resolve the conflict in the working directory, and update
   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>
+</ol></div>
+<div class="para"><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 -r .dotest</tt> before running the command with mailbox
-names.</p>
+names.</p></div>
 </div>
-<h2>SEE ALSO</h2>
+<h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
-<p><a href="git-apply.html">git-apply(1)</a>.</p>
+<div class="para"><p><a href="git-apply.html">git-apply(1)</a>.</p></div>
 </div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
 <div class="sectionbody">
-<p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p>
+<div class="para"><p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p></div>
 </div>
-<h2>Documentation</h2>
+<h2 id="_documentation">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 class="para"><p>Documentation by Petr Baudis, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
 </div>
-<h2>GIT</h2>
+<h2 id="_git">GIT</h2>
 <div class="sectionbody">
-<p>Part of the <a href="git.html">git(1)</a> suite</p>
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Jul-2008 03:01:31 UTC
+Last updated 2008-07-06 05:16:34 UTC
 </div>
 </div>
 </body>
author	Junio C Hamano <junio@hera.kernel.org>	2008-07-06 05:20:31 +0000
committer	Junio C Hamano <junio@hera.kernel.org>	2008-07-06 05:20:31 +0000
commit	ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch)
tree	390507328a7564b65dc803683c34235700b97409 /git-am.html
parent	05bf9c54a827e48b2b576488f5170a3490b5180e (diff)
download	git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz