diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
| commit | 68cf15a825368c926443c26a6516947fca3c1d39 (patch) | |
| tree | a587c9a51372746ddc3cdb08108bb14fb94a0488 /git-commit-tree.html | |
| parent | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (diff) | |
| download | git-htmldocs-68cf15a825368c926443c26a6516947fca3c1d39.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-161-g3089c
Diffstat (limited to 'git-commit-tree.html')
| -rw-r--r-- | git-commit-tree.html | 230 |
1 files changed, 162 insertions, 68 deletions
diff --git a/git-commit-tree.html b/git-commit-tree.html index 7b2e2193b..5cf41cf8d 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -3,7 +3,8 @@ <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 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-commit-tree(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
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;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { 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; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
-div.hlist {
+
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
}
-td.hlist1 {
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-commit-tree(1)</title>
</head>
<body>
<div id="header">
@@ -318,33 +412,33 @@ git-commit-tree(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git commit-tree</em> <tree> [(-p <parent commit>)…] < changelog</p></div>
+<div class="paragraph"><p><em>git commit-tree</em> <tree> [(-p <parent commit>)…] < changelog</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>This is usually not what an end user wants to run directly. See
+<div class="paragraph"><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
+<div class="paragraph"><p>Creates a new commit object based on the provided tree object and
emits the new commit object id on stdout.</p></div>
-<div class="para"><p>A commit object may have any number of parents. With exactly one
+<div class="paragraph"><p>A commit object may have any number of parents. With exactly one
parent, it is an ordinary commit. Having more than one parent makes
the commit a merge between several lines of history. Initial (root)
commits have no parents.</p></div>
-<div class="para"><p>While a tree represents a particular directory state of a working
+<div class="paragraph"><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></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
+<div class="paragraph"><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></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
<tree>
</dt>
<dd>
@@ -352,7 +446,7 @@ state was.</p></div> An existing tree object
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-p <parent commit>
</dt>
<dd>
@@ -364,8 +458,8 @@ state was.</p></div> </div>
<h2 id="_commit_information">Commit Information</h2>
<div class="sectionbody">
-<div class="para"><p>A commit encapsulates:</p></div>
-<div class="ilist"><ul>
+<div class="paragraph"><p>A commit encapsulates:</p></div>
+<div class="ulist"><ul>
<li>
<p>
all parent object ids
@@ -382,7 +476,7 @@ committer name and email and the commit time. </p>
</li>
</ul></div>
-<div class="para"><p>While parent object ids are provided on the command line, author and
+<div class="paragraph"><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></div>
<div class="literalblock">
@@ -395,20 +489,20 @@ GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
EMAIL</tt></pre>
</div></div>
-<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
+<div class="paragraph"><p>(nb "<", ">" and "\n"s are stripped)</p></div>
+<div class="paragraph"><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></div>
-<div class="para"><p>A commit comment is read from stdin. If a changelog
+<div class="paragraph"><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 id="_date_formats">DATE FORMATS</h2>
<div class="sectionbody">
-<div class="para"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
+<div class="paragraph"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
support the following date formats:</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Git internal format
</dt>
<dd>
@@ -419,7 +513,7 @@ Git internal format For example CET (which is 2 hours ahead UTC) is <tt>+0200</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
RFC 2822
</dt>
<dd>
@@ -428,7 +522,7 @@ RFC 2822 <tt>Thu, 07 Apr 2005 22:13:13 +0200</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
ISO 8601
</dt>
<dd>
@@ -451,16 +545,16 @@ ISO 8601 </div>
<h2 id="_diagnostics">Diagnostics</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
-You don't exist. Go away!
+<div class="dlist"><dl>
+<dt class="hdlist1">
+You don’t exist. Go away!
</dt>
<dd>
<p>
- The passwd(5) gecos field couldn't be read
+ The passwd(5) gecos field couldn’t be read
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Your parents must have hated you!
</dt>
<dd>
@@ -468,7 +562,7 @@ Your parents must have hated you! The passwd(5) gecos field is longer than a giant static buffer.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Your sysadmin must hate you!
</dt>
<dd>
@@ -480,8 +574,8 @@ Your sysadmin must hate you! </div>
<h2 id="_discussion">Discussion</h2>
<div class="sectionbody">
-<div class="para"><p>At the core level, git is character encoding agnostic.</p></div>
-<div class="ilist"><ul>
+<div class="paragraph"><p>At the core level, git is character encoding agnostic.</p></div>
+<div class="ulist"><ul>
<li>
<p>
The pathnames recorded in the index and in the tree objects
@@ -506,13 +600,13 @@ The commit log messages are uninterpreted sequences of non-NUL </p>
</li>
</ul></div>
-<div class="para"><p>Although we encourage that the commit log messages are encoded
+<div class="paragraph"><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></div>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
<em>git commit</em> and <em>git commit-tree</em> issues
@@ -526,7 +620,7 @@ mind.</p></div> <pre><tt>[i18n]
commitencoding = ISO-8859-1</tt></pre>
</div></div>
-<div class="para"><p>Commit objects created with the above setting record the value
+<div class="paragraph"><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></div>
@@ -544,34 +638,34 @@ implies that the commit log message is encoded in UTF-8.</p></div> <pre><tt>[i18n]
logoutputencoding = ISO-8859-1</tt></pre>
</div></div>
-<div class="para"><p>If you do not have this configuration variable, the value of
+<div class="paragraph"><p>If you do not have this configuration variable, the value of
<tt>i18n.commitencoding</tt> is used instead.</p></div>
</li>
</ol></div>
-<div class="para"><p>Note that we deliberately chose not to re-code the commit log
+<div class="paragraph"><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></div>
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="para"><p><a href="git-write-tree.html">git-write-tree(1)</a></p></div>
+<div class="paragraph"><p><a href="git-write-tree.html">git-write-tree(1)</a></p></div>
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>
+<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
+<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-10-22 04:11:03 UTC
+Last updated 2010-11-06 00:41:57 UTC
</div>
</div>
</body>
|