diff options
| 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-format-patch.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-format-patch.html')
| -rw-r--r-- | git-format-patch.html | 162 |
1 files changed, 105 insertions, 57 deletions
diff --git a/git-format-patch.html b/git-format-patch.html index b4131ca91..cabd928c4 100644 --- a/git-format-patch.html +++ b/git-format-patch.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-format-patch(1)</title>
</head>
@@ -285,14 +333,14 @@ git-format-patch(1) Manual Page [--cover-letter]
[ <since> | <revision range> ]</div></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>Prepare each commit with its patch in
+<div class="para"><p>Prepare each commit with its patch in
one file per commit, formatted to resemble UNIX mailbox format.
The output of this command is convenient for e-mail submission or
-for use with <tt>git-am</tt>.</p>
-<p>There are two ways to specify which commits to operate on.</p>
-<ol>
+for use with <em>git-am</em>.</p></div>
+<div class="para"><p>There are two ways to specify which commits to operate on.</p></div>
+<div class="olist"><ol>
<li>
<p>
A single commit, <since>, specifies that the commits leading
@@ -307,33 +355,33 @@ Generic <revision range> expression (see "SPECIFYING commits in the specified range.
</p>
</li>
-</ol>
-<p>A single commit, when interpreted as a <revision range>
+</ol></div>
+<div class="para"><p>A single commit, when interpreted as a <revision range>
expression, means "everything that leads to that commit", but
if you write <em>git format-patch <commit></em>, the previous rule
applies to that command line and you do not get "everything
since the beginning of the time". If you want to format
everything since project inception to one commit, say "git
format-patch --root <commit>" to make it clear that it is the
-latter case.</p>
-<p>By default, each output file is numbered sequentially from 1, and uses the
+latter case.</p></div>
+<div class="para"><p>By default, each output file is numbered sequentially from 1, and uses the
first line of the commit message (massaged for pathname safety) as
the filename. With the --numbered-files option, the output file names
will only be numbers, without the first line of the commit appended.
The names of the output files are printed to standard
-output, unless the --stdout option is specified.</p>
-<p>If -o is specified, output files are created in <dir>. Otherwise
-they are created in the current working directory.</p>
-<p>If -n is specified, instead of "[PATCH] Subject", the first line
-is formatted as "[PATCH n/m] Subject".</p>
-<p>If given --thread, <tt>git-format-patch</tt> will generate In-Reply-To and
+output, unless the --stdout option is specified.</p></div>
+<div class="para"><p>If -o is specified, output files are created in <dir>. Otherwise
+they are created in the current working directory.</p></div>
+<div class="para"><p>If -n is specified, instead of "[PATCH] Subject", the first line
+is formatted as "[PATCH n/m] Subject".</p></div>
+<div class="para"><p>If given --thread, <em>git-format-patch</em> will generate In-Reply-To and
References headers to make the second and subsequent patch mails appear
as replies to the first mail; this also generates a Message-Id header to
-reference.</p>
+reference.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
-p
</dt>
@@ -804,10 +852,10 @@ reference.</p> Do not show any source or destination prefix.
</p>
</dd>
-</dl>
-<p>For more detailed explanation on these common options, see also
-<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p>
-<dl>
+</dl></div>
+<div class="para"><p>For more detailed explanation on these common options, see also
+<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
+<div class="vlist"><dl>
<dt>
-<n>
</dt>
@@ -992,10 +1040,10 @@ reference.</p> filenames, use specified suffix. A common alternative is
<tt>--suffix=.txt</tt>.
</p>
-<p>Note that you would need to include the leading dot <tt>.</tt> if you
+<div class="para"><p>Note that you would need to include the leading dot <tt>.</tt> if you
want a filename like <tt>0001-description-of-my-change.patch</tt>, and
the first letter does not have to be a dot. Leaving it empty would
-not add any suffix.</p>
+not add any suffix.</p></div>
</dd>
<dt>
--no-binary
@@ -1008,13 +1056,13 @@ not add any suffix.</p> encoded in the patch.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>CONFIGURATION</h2>
+<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
-<p>You can specify extra mail header lines to be added to each message
+<div class="para"><p>You can specify extra mail header lines to be added to each message
in the repository configuration, new defaults for the subject prefix
-and file suffix, and number patches when outputting more than one.</p>
+and file suffix, and number patches when outputting more than one.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>[format]
@@ -1025,17 +1073,17 @@ and file suffix, and number patches when outputting more than one.</p> cc = <email></tt></pre>
</div></div>
</div>
-<h2>EXAMPLES</h2>
+<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
-<ul>
+<div class="ilist"><ul>
<li>
<p>
Extract commits between revisions R1 and R2, and apply them on top of
-the current branch using <tt>git-am</tt> to cherry-pick them:
+the current branch using <em>git-am</em> to cherry-pick them:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git format-patch -k --stdout R1..R2 | git-am -3 -k</tt></pre>
+<pre><tt>$ git format-patch -k --stdout R1..R2 | git am -3 -k</tt></pre>
</div></div>
</li>
<li>
@@ -1047,7 +1095,7 @@ origin branch: <div class="content">
<pre><tt>$ git format-patch origin</tt></pre>
</div></div>
-<p>For each commit a separate file is created in the current directory.</p>
+<div class="para"><p>For each commit a separate file is created in the current directory.</p></div>
</li>
<li>
<p>
@@ -1056,7 +1104,7 @@ project: </p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git format-patch \--root origin</tt></pre>
+<pre><tt>$ git format-patch --root origin</tt></pre>
</div></div>
</li>
<li>
@@ -1067,11 +1115,11 @@ The same as the previous one: <div class="content">
<pre><tt>$ git format-patch -M -B origin</tt></pre>
</div></div>
-<p>Additionally, it detects and handles renames and complete rewrites
+<div class="para"><p>Additionally, it detects and handles renames and complete rewrites
intelligently to produce a renaming patch. A renaming patch reduces
the amount of text output, and generally makes it easier to review it.
Note that the "patch" program does not understand renaming patches, so
-use it only when you know the recipient uses git to apply your patch.</p>
+use it only when you know the recipient uses git to apply your patch.</p></div>
</li>
<li>
<p>
@@ -1083,27 +1131,27 @@ as e-mailable patches: <pre><tt>$ git format-patch -3</tt></pre>
</div></div>
</li>
-</ul>
+</ul></div>
</div>
-<h2>SEE ALSO</h2>
+<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<p><a href="git-am.html">git-am(1)</a>, <a href="git-send-email.html">git-send-email(1)</a></p>
+<div class="para"><p><a href="git-am.html">git-am(1)</a>, <a href="git-send-email.html">git-send-email(1)</a></p></div>
</div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Junio C Hamano <junkio@cox.net></p>
+<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</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:46 UTC
+Last updated 2008-07-06 05:16:48 UTC
</div>
</div>
</body>
|