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-commit-tree.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-commit-tree.html')
| -rw-r--r-- | git-commit-tree.html | 180 |
1 files changed, 114 insertions, 66 deletions
diff --git a/git-commit-tree.html b/git-commit-tree.html index 0e5372683..1f832dfb7 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.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-commit-tree(1)</title>
</head>
@@ -272,30 +320,30 @@ git-commit-tree(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git commit-tree</em> <tree> [-p <parent commit>]* < changelog</p>
+<div class="para"><p><em>git commit-tree</em> <tree> [-p <parent commit>]* < changelog</p></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>This is usually not what an end user wants to run directly. See
-<a href="git-commit.html">git-commit(1)</a> instead.</p>
-<p>Creates a new commit object based on the provided tree object and
+<div class="para"><p>This is usually not what an end user wants to run directly. See
+<a href="git-commit.html">git-commit(1)</a> instead.</p></div>
+<div class="para"><p>Creates a new commit object based on the provided tree object and
emits the new commit object id on stdout. If no parent is given then
-it is considered to be an initial tree.</p>
-<p>A commit object usually has 1 parent (a commit after a change) or up
+it is considered to be an initial tree.</p></div>
+<div class="para"><p>A commit object usually has 1 parent (a commit after a change) or up
to 16 parents. More than one parent represents a merge of branches
-that led to them.</p>
-<p>While a tree represents a particular directory state of a working
+that led to them.</p></div>
+<div class="para"><p>While a tree represents a particular directory state of a working
directory, a commit represents that state in "time", and explains how
-to get there.</p>
-<p>Normally a commit would identify a new "HEAD" state, and while git
+to get there.</p></div>
+<div class="para"><p>Normally a commit would identify a new "HEAD" state, and while git
doesn't care where you save the note about that state, in practice we
tend to just write the result to the file that is pointed at by
<tt>.git/HEAD</tt>, so that we can always see what the last committed
-state was.</p>
+state was.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
<tree>
</dt>
@@ -312,12 +360,12 @@ state was.</p> Each <em>-p</em> indicates the id of a parent commit object.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Commit Information</h2>
+<h2 id="_commit_information">Commit Information</h2>
<div class="sectionbody">
-<p>A commit encapsulates:</p>
-<ul>
+<div class="para"><p>A commit encapsulates:</p></div>
+<div class="ilist"><ul>
<li>
<p>
all parent object ids
@@ -333,10 +381,10 @@ author name, email and date committer name and email and the commit time.
</p>
</li>
-</ul>
-<p>While parent object ids are provided on the command line, author and
+</ul></div>
+<div class="para"><p>While parent object ids are provided on the command line, author and
committer information is taken from the following environment variables,
-if set:</p>
+if set:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>GIT_AUTHOR_NAME
@@ -347,17 +395,17 @@ GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
EMAIL</tt></pre>
</div></div>
-<p>(nb "<", ">" and "\n"s are stripped)</p>
-<p>In case (some of) these environment variables are not set, the information
+<div class="para"><p>(nb "<", ">" and "\n"s are stripped)</p></div>
+<div class="para"><p>In case (some of) these environment variables are not set, the information
is taken from the configuration items user.name and user.email, or, if not
-present, system user name and fully qualified hostname.</p>
-<p>A commit comment is read from stdin. If a changelog
-entry is not provided via "<" redirection, <tt>git-commit-tree</tt> will just wait
-for one to be entered and terminated with ^D.</p>
+present, system user name and fully qualified hostname.</p></div>
+<div class="para"><p>A commit comment is read from stdin. If a changelog
+entry is not provided via "<" redirection, <em>git-commit-tree</em> will just wait
+for one to be entered and terminated with ^D.</p></div>
</div>
-<h2>Diagnostics</h2>
+<h2 id="_diagnostics">Diagnostics</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
You don't exist. Go away!
</dt>
@@ -382,12 +430,12 @@ Your sysadmin must hate you! The password(5) name field is longer than a giant static buffer.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Discussion</h2>
+<h2 id="_discussion">Discussion</h2>
<div class="sectionbody">
-<p>At the core level, git is character encoding agnostic.</p>
-<ul>
+<div class="para"><p>At the core level, git is character encoding agnostic.</p></div>
+<div class="ilist"><ul>
<li>
<p>
The pathnames recorded in the index and in the tree objects
@@ -411,17 +459,17 @@ The commit log messages are uninterpreted sequence of non-NUL bytes.
</p>
</li>
-</ul>
-<p>Although we encourage that the commit log messages are encoded
+</ul></div>
+<div class="para"><p>Although we encourage that the commit log messages are encoded
in UTF-8, both the core and git Porcelain are designed not to
force UTF-8 on projects. If all participants of a particular
project find it more convenient to use legacy encodings, git
does not forbid it. However, there are a few things to keep in
-mind.</p>
-<ol>
+mind.</p></div>
+<div class="olist"><ol>
<li>
<p>
-<tt>git-commit-tree</tt> (hence, <tt>git-commit</tt> which uses it) issues
+<em>git-commit-tree</em> (hence, <em>git-commit</em> which uses it) issues
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
@@ -432,14 +480,14 @@ mind.</p> <pre><tt>[i18n]
commitencoding = ISO-8859-1</tt></pre>
</div></div>
-<p>Commit objects created with the above setting record the value
+<div class="para"><p>Commit objects created with the above setting record the value
of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to
help other people who look at them later. Lack of this header
-implies that the commit log message is encoded in UTF-8.</p>
+implies that the commit log message is encoded in UTF-8.</p></div>
</li>
<li>
<p>
-<tt>git-log</tt>, <tt>git-show</tt> and friends looks at the <tt>encoding</tt>
+<em>git-log</em>, <em>git-show</em> and friends looks at the <tt>encoding</tt>
header of a commit object, and tries to re-code the log
message into UTF-8 unless otherwise specified. You can
specify the desired output encoding with
@@ -450,34 +498,34 @@ implies that the commit log message is encoded in UTF-8.</p> <pre><tt>[i18n]
logoutputencoding = ISO-8859-1</tt></pre>
</div></div>
-<p>If you do not have this configuration variable, the value of
-<tt>i18n.commitencoding</tt> is used instead.</p>
+<div class="para"><p>If you do not have this configuration variable, the value of
+<tt>i18n.commitencoding</tt> is used instead.</p></div>
</li>
-</ol>
-<p>Note that we deliberately chose not to re-code the commit log
+</ol></div>
+<div class="para"><p>Note that we deliberately chose not to re-code the commit log
message when a commit is made to force UTF-8 at the commit
object level, because re-coding to UTF-8 is not necessarily a
-reversible operation.</p>
+reversible operation.</p></div>
</div>
-<h2>SEE ALSO</h2>
+<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<p><a href="git-write-tree.html">git-write-tree(1)</a></p>
+<div class="para"><p><a href="git-write-tree.html">git-write-tree(1)</a></p></div>
</div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
+<div class="para"><p>Documentation by David Greaves, 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:36 UTC
+Last updated 2008-07-06 05:16:39 UTC
</div>
</div>
</body>
|