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-show.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-show.html')
| -rw-r--r-- | git-show.html | 206 |
1 files changed, 127 insertions, 79 deletions
diff --git a/git-show.html b/git-show.html index 6f69343c4..ac2d52e15 100644 --- a/git-show.html +++ b/git-show.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-show(1)</title>
</head>
@@ -272,25 +320,25 @@ git-show(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git show</em> [options] <object>…</p>
+<div class="para"><p><em>git show</em> [options] <object>…</p></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>Shows one or more objects (blobs, trees, tags and commits).</p>
-<p>For commits it shows the log message and textual diff. It also
+<div class="para"><p>Shows one or more objects (blobs, trees, tags and commits).</p></div>
+<div class="para"><p>For commits it shows the log message and textual diff. It also
presents the merge commit in a special format as produced by
-<tt>git-diff-tree --cc</tt>.</p>
-<p>For tags, it shows the tag message and the referenced objects.</p>
-<p>For trees, it shows the names (equivalent to <tt>git-ls-tree</tt>
-with --name-only).</p>
-<p>For plain blobs, it shows the plain contents.</p>
-<p>The command takes options applicable to the <tt>git-diff-tree</tt> command to
-control how the changes the commit introduces are shown.</p>
-<p>This manual page describes only the most frequently used options.</p>
+<em>git-diff-tree --cc</em>.</p></div>
+<div class="para"><p>For tags, it shows the tag message and the referenced objects.</p></div>
+<div class="para"><p>For trees, it shows the names (equivalent to <em>git-ls-tree</em>
+with --name-only).</p></div>
+<div class="para"><p>For plain blobs, it shows the plain contents.</p></div>
+<div class="para"><p>The command takes options applicable to the <em>git-diff-tree</em> command to
+control how the changes the commit introduces are shown.</p></div>
+<div class="para"><p>This manual page describes only the most frequently used options.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
<object>
</dt>
@@ -311,8 +359,8 @@ control how the changes the commit introduces are shown.</p> <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>.
When omitted, the format defaults to <em>medium</em>.
</p>
-<p>Note: you can specify the default pretty format in the repository
-configuration (see <a href="git-config.html">git-config(1)</a>).</p>
+<div class="para"><p>Note: you can specify the default pretty format in the repository
+configuration (see <a href="git-config.html">git-config(1)</a>).</p></div>
</dd>
<dt>
--abbrev-commit
@@ -324,8 +372,8 @@ configuration (see <a href="git-config.html">git-config(1)</a>).</p> digits can be specified with "--abbrev=<n>" (which also modifies
diff output, if it is displayed).
</p>
-<p>This should make "--pretty=oneline" a whole lot more readable for
-people using 80-column terminals.</p>
+<div class="para"><p>This should make "--pretty=oneline" a whole lot more readable for
+people using 80-column terminals.</p></div>
</dd>
<dt>
--encoding[=<encoding>]
@@ -339,11 +387,11 @@ people using 80-column terminals.</p> defaults to UTF-8.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>PRETTY FORMATS</h2>
+<h2 id="_pretty_formats">PRETTY FORMATS</h2>
<div class="sectionbody">
-<p>If the commit is a merge, and if the pretty-format
+<div class="para"><p>If the commit is a merge, and if the pretty-format
is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
inserted before the <em>Author:</em> line. This line begins with
"Merge: " and the sha1s of ancestral commits are printed,
@@ -351,9 +399,9 @@ separated by spaces. Note that the listed commits may not necessarily be the list of the <strong>direct</strong> parent commits if you
have limited your view of history: for example, if you are
only interested in changes related to a certain directory or
-file.</p>
-<p>Here are some additional details for each format:</p>
-<ul>
+file.</p></div>
+<div class="para"><p>Here are some additional details for each format:</p></div>
+<div class="ilist"><ul>
<li>
<p>
<em>oneline</em>
@@ -362,7 +410,7 @@ file.</p> <div class="content">
<pre><tt><sha1> <title line></tt></pre>
</div></div>
-<p>This is designed to be as compact as possible.</p>
+<div class="para"><p>This is designed to be as compact as possible.</p></div>
</li>
<li>
<p>
@@ -386,7 +434,7 @@ Author: <author></tt></pre> <div class="content">
<pre><tt>commit <sha1>
Author: <author>
-Date: <date></tt></pre>
+Date: <author date></tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
@@ -424,9 +472,9 @@ Commit: <committer></tt></pre> <div class="content">
<pre><tt>commit <sha1>
Author: <author>
-AuthorDate: <date & time>
+AuthorDate: <author date>
Commit: <committer>
-CommitDate: <date & time></tt></pre>
+CommitDate: <committer date></tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
@@ -445,7 +493,7 @@ CommitDate: <date & time></tt></pre> <div class="content">
<pre><tt>From <sha1> <date>
From: <author>
-Date: <date & time>
+Date: <author date>
Subject: [PATCH] <title line></tt></pre>
</div></div>
<div class="literalblock">
@@ -457,31 +505,31 @@ Subject: [PATCH] <title line></tt></pre> <p>
<em>raw</em>
</p>
-<p>The <em>raw</em> format shows the entire commit exactly as
+<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as
stored in the commit object. Notably, the SHA1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and <em>parents</em> information show the
true parent commits, without taking grafts nor history
-simplification into account.</p>
+simplification into account.</p></div>
</li>
<li>
<p>
<em>format:</em>
</p>
-<p>The <em>format:</em> format allows you to specify which information
+<div class="para"><p>The <em>format:</em> format allows you to specify which information
you want to show. It works a little bit like printf format,
with the notable exception that you get a newline with <em>%n</em>
-instead of <em>\n</em>.</p>
-<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
-would show something like this:</p>
+instead of <em>\n</em>.</p></div>
+<div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
+would show something like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
</tt></pre>
</div></div>
-<p>The placeholders are:</p>
-<ul>
+<div class="para"><p>The placeholders are:</p></div>
+<div class="ilist"><ul>
<li>
<p>
<em>%H</em>: commit hash
@@ -632,19 +680,19 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff <em>%x00</em>: print a byte from a hex code
</p>
</li>
-</ul>
+</ul></div>
</li>
<li>
<p>
<em>tformat:</em>
</p>
-<p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
+<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
provides "terminator" semantics instead of "separator" semantics. In
other words, each commit has the message terminator character (usually a
newline) appended, rather than a separator placed between entries.
This means that the final entry of a single-line format will be properly
terminated with a new line, just as the "oneline" format does.
-For example:</p>
+For example:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
@@ -658,11 +706,11 @@ $ git log -2 --pretty=tformat:%h 4da45bef \ 7134973</tt></pre>
</div></div>
</li>
-</ul>
+</ul></div>
</div>
-<h2>EXAMPLES</h2>
+<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
git show v1.0.0
</dt>
@@ -699,12 +747,12 @@ git show master:Makefile master:t/Makefile of the branch <tt>master</tt>.
</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
@@ -728,17 +776,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
@@ -749,14 +797,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
@@ -767,32 +815,32 @@ 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>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Linus Torvalds <torvalds@osdl.org> and
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and
Junio C Hamano <junkio@cox.net>. Significantly enhanced by
-Johannes Schindelin <Johannes.Schindelin@gmx.de>.</p>
+Johannes Schindelin <Johannes.Schindelin@gmx.de>.</p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>.</p>
+<div class="para"><p>Documentation by David Greaves, Petr Baudis 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:02:03 UTC
+Last updated 2008-07-06 05:17:03 UTC
</div>
</div>
</body>
|