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-rev-parse.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-rev-parse.html')
| -rw-r--r-- | git-rev-parse.html | 206 |
1 files changed, 127 insertions, 79 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html index 0286d4fa9..54309af0a 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.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-rev-parse(1)</title>
</head>
@@ -272,26 +320,26 @@ git-rev-parse(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git rev-parse</em> [ --option ] <args>…</p>
+<div class="para"><p><em>git rev-parse</em> [ --option ] <args>…</p></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>Many git porcelainish commands take mixture of flags
+<div class="para"><p>Many git porcelainish commands take mixture of flags
(i.e. parameters that begin with a dash <em>-</em>) and parameters
-meant for the underlying <tt>git-rev-list</tt> command they use internally
+meant for the underlying <em>git-rev-list</em> command they use internally
and flags and parameters for the other commands they use
-downstream of <tt>git-rev-list</tt>. This command is used to
-distinguish between them.</p>
+downstream of <em>git-rev-list</em>. This command is used to
+distinguish between them.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
--parseopt
</dt>
<dd>
<p>
- Use <tt>git-rev-parse</tt> in option parsing mode (see PARSEOPT section below).
+ Use <em>git-rev-parse</em> in option parsing mode (see PARSEOPT section below).
</p>
</dd>
<dt>
@@ -309,7 +357,7 @@ distinguish between them.</p> <dd>
<p>
Do not output flags and parameters not meant for
- <tt>git-rev-list</tt> command.
+ <em>git-rev-list</em> command.
</p>
</dd>
<dt>
@@ -318,7 +366,7 @@ distinguish between them.</p> <dd>
<p>
Do not output flags and parameters meant for
- <tt>git-rev-list</tt> command.
+ <em>git-rev-list</em> command.
</p>
</dd>
<dt>
@@ -378,7 +426,7 @@ distinguish between them.</p> properly quoted for consumption by shell. Useful when
you expect your parameter to contain whitespaces and
newlines (e.g. when using pickaxe <tt>-S</tt> with
- <tt>git-diff-*</tt>).
+ <em>git-diff-*</em>).
</p>
</dd>
<dt>
@@ -522,7 +570,7 @@ distinguish between them.</p> <dd>
<p>
Parse the date string, and output the corresponding
- --max-age= parameter for <tt>git-rev-list</tt>.
+ --max-age= parameter for <em>git-rev-list</em>.
</p>
</dd>
<dt>
@@ -534,7 +582,7 @@ distinguish between them.</p> <dd>
<p>
Parse the date string, and output the corresponding
- --min-age= parameter for <tt>git-rev-list</tt>.
+ --min-age= parameter for <em>git-rev-list</em>.
</p>
</dd>
<dt>
@@ -545,16 +593,16 @@ distinguish between them.</p> Flags and parameters to be parsed.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>SPECIFYING REVISIONS</h2>
+<h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2>
<div class="sectionbody">
-<p>A revision parameter typically, but not necessarily, names a
+<div class="para"><p>A revision parameter typically, but not necessarily, names a
commit object. They use what is called an <em>extended SHA1</em>
syntax. Here are various ways to spell object names. The
ones listed near the end of this list are to name trees and
-blobs contained in a commit.</p>
-<ul>
+blobs contained in a commit.</p></div>
+<div class="ilist"><ul>
<li>
<p>
The full SHA1 object name (40-byte hexadecimal string), or
@@ -566,7 +614,7 @@ The full SHA1 object name (40-byte hexadecimal string), or </li>
<li>
<p>
-An output from <tt>git-describe</tt>; i.e. a closest tag, followed by a
+An output from <em>git-describe</em>; i.e. a closest tag, followed by a
dash, a <tt>g</tt>, and an abbreviated object name.
</p>
</li>
@@ -579,7 +627,7 @@ A symbolic ref name. E.g. <em>master</em> typically means the commit When ambiguous, a <tt><name></tt> is disambiguated by taking the
first match in the following rules:
</p>
-<ol>
+<div class="olist"><ol>
<li>
<p>
if <tt>$GIT_DIR/<name></tt> exists, that is what you mean (this is usually
@@ -611,7 +659,7 @@ otherwise, <tt>$GIT_DIR/refs/remotes/<name></tt> if exists; otherwise, <tt>$GIT_DIR/refs/remotes/<name>/HEAD</tt> if exists.
</p>
</li>
-</ol>
+</ol></div>
</li>
<li>
<p>
@@ -711,10 +759,10 @@ A colon, optionally followed by a stage number (0 to 3) and a the branch being merged.
</p>
</li>
-</ul>
-<p>Here is an illustration, by Jon Loeliger. Both commit nodes B
+</ul></div>
+<div class="para"><p>Here is an illustration, by Jon Loeliger. Both commit nodes B
and C are parents of commit node A. Parent commits are ordered
-left-to-right.</p>
+left-to-right.</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>G H I J
@@ -742,31 +790,31 @@ I = F^ = B^3^ = A^^3^ J = F^2 = B^3^2 = A^^3^2</tt></pre>
</div></div>
</div>
-<h2>SPECIFYING RANGES</h2>
+<h2 id="_specifying_ranges">SPECIFYING RANGES</h2>
<div class="sectionbody">
-<p>History traversing commands such as <tt>git-log</tt> operate on a set
+<div class="para"><p>History traversing commands such as <em>git-log</em> operate on a set
of commits, not just a single commit. To these commands,
specifying a single revision with the notation described in the
previous section means the set of commits reachable from that
-commit, following the commit ancestry chain.</p>
-<p>To exclude commits reachable from a commit, a prefix <tt>^</tt>
+commit, following the commit ancestry chain.</p></div>
+<div class="para"><p>To exclude commits reachable from a commit, a prefix <tt>^</tt>
notation is used. E.g. "<tt>^r1 r2</tt>" means commits reachable
-from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p>
-<p>This set operation appears so often that there is a shorthand
+from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p></div>
+<div class="para"><p>This set operation appears so often that there is a shorthand
for it. "<tt>r1..r2</tt>" is equivalent to "<tt>^r1 r2</tt>". It is
the difference of two sets (subtract the set of commits
reachable from <tt>r1</tt> from the set of commits reachable from
-<tt>r2</tt>).</p>
-<p>A similar notation "<tt>r1...r2</tt>" is called symmetric difference
+<tt>r2</tt>).</p></div>
+<div class="para"><p>A similar notation "<tt>r1...r2</tt>" is called symmetric difference
of <tt>r1</tt> and <tt>r2</tt> and is defined as
"<tt>r1 r2 --not $(git merge-base --all r1 r2)</tt>".
It is the set of commits that are reachable from either one of
-<tt>r1</tt> or <tt>r2</tt> but not from both.</p>
-<p>Two other shorthands for naming a set that is formed by a commit
+<tt>r1</tt> or <tt>r2</tt> but not from both.</p></div>
+<div class="para"><p>Two other shorthands for naming a set that is formed by a commit
and its parent commits exists. <tt>r1^@</tt> notation means all
parents of <tt>r1</tt>. <tt>r1^!</tt> includes commit <tt>r1</tt> but excludes
-its all parents.</p>
-<p>Here are a handful of examples:</p>
+its all parents.</p></div>
+<div class="para"><p>Here are a handful of examples:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>D G H D
@@ -779,26 +827,26 @@ C^@ I J F F^! D G H D F</tt></pre>
</div></div>
</div>
-<h2>PARSEOPT</h2>
+<h2 id="_parseopt">PARSEOPT</h2>
<div class="sectionbody">
-<p>In <tt>--parseopt</tt> mode, <tt>git-rev-parse</tt> helps massaging options to bring to shell
+<div class="para"><p>In <tt>--parseopt</tt> mode, <em>git-rev-parse</em> helps massaging options to bring to shell
scripts the same facilities C builtins have. It works as an option normalizer
-(e.g. splits single switches aggregate values), a bit like <tt>getopt(1)</tt> does.</p>
-<p>It takes on the standard input the specification of the options to parse and
+(e.g. splits single switches aggregate values), a bit like <tt>getopt(1)</tt> does.</p></div>
+<div class="para"><p>It takes on the standard input the specification of the options to parse and
understand, and echoes on the standard output a line suitable for <tt>sh(1)</tt> <tt>eval</tt>
to replace the arguments with normalized ones. In case of error, it outputs
-usage on the standard error stream, and exits with code 129.</p>
-<h3>Input Format</h3>
-<p><tt>git-rev-parse --parseopt</tt> input format is fully text based. It has two parts,
+usage on the standard error stream, and exits with code 129.</p></div>
+<h3 id="_input_format">Input Format</h3><div style="clear:left"></div>
+<div class="para"><p><em>git-rev-parse --parseopt</em> input format is fully text based. It has two parts,
separated by a line that contains only <tt>--</tt>. The lines before the separator
(should be more than one) are used for the usage.
-The lines after the separator describe the options.</p>
-<p>Each line of options has this format:</p>
+The lines after the separator describe the options.</p></div>
+<div class="para"><p>Each line of options has this format:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt><opt_spec><flags>* SP+ help LF</tt></pre>
</div></div>
-<dl>
+<div class="vlist"><dl>
<dt>
<tt><opt_spec></tt>
</dt>
@@ -817,7 +865,7 @@ The lines after the separator describe the options.</p> <p>
<tt><flags></tt> are of <tt>*</tt>, <tt>=</tt>, <tt>?</tt> or <tt>!</tt>.
</p>
-<ul>
+<div class="ilist"><ul>
<li>
<p>
Use <tt>=</tt> if the option takes an argument.
@@ -840,15 +888,15 @@ Use <tt>*</tt> to mean that this option should not be listed in the usage Use <tt>!</tt> to not make the corresponding negated long option available.
</p>
</li>
-</ul>
+</ul></div>
</dd>
-</dl>
-<p>The remainder of the line, after stripping the spaces, is used
-as the help associated to the option.</p>
-<p>Blank lines are ignored, and lines that don't match this specification are used
+</dl></div>
+<div class="para"><p>The remainder of the line, after stripping the spaces, is used
+as the help associated to the option.</p></div>
+<div class="para"><p>Blank lines are ignored, and lines that don't match this specification are used
as option group headers (start the line with a space to create such
-lines on purpose).</p>
-<h3>Example</h3>
+lines on purpose).</p></div>
+<h3 id="_example">Example</h3><div style="clear:left"></div>
<div class="listingblock">
<div class="content">
<pre><tt>OPTS_SPEC="\
@@ -867,9 +915,9 @@ C? option C with an optional argument" eval `echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?`</tt></pre>
</div></div>
</div>
-<h2>EXAMPLES</h2>
+<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
-<ul>
+<div class="ilist"><ul>
<li>
<p>
Print the object name of the current commit:
@@ -887,7 +935,7 @@ Print the commit object name from the revision in the $REV shell variable: <div class="content">
<pre><tt>$ git rev-parse --verify $REV</tt></pre>
</div></div>
-<p>This will error out if $REV is empty or not a valid revision.</p>
+<div class="para"><p>This will error out if $REV is empty or not a valid revision.</p></div>
</li>
<li>
<p>
@@ -897,26 +945,26 @@ Same as above: <div class="content">
<pre><tt>$ git rev-parse --default master --verify $REV</tt></pre>
</div></div>
-<p>but if $REV is empty, the commit object name from master will be printed.</p>
+<div class="para"><p>but if $REV is empty, the commit object name from master will be printed.</p></div>
</li>
-</ul>
+</ul></div>
</div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Linus Torvalds <torvalds@osdl.org> .
-Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org></p>
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> .
+Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org></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:02:00 UTC
+Last updated 2008-07-06 05:17:00 UTC
</div>
</div>
</body>
|