summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-18 16:43:11 -0800
committerJunio C Hamano <gitster@pobox.com>2012-12-18 16:43:11 -0800
commit9d9711544dc3090db6e5c52f9ce9c300bf4f5c14 (patch)
tree23257b9801739fd96c9e82ef98a17500dce9f88e /git-rev-parse.html
parent9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 (diff)
downloadgit-htmldocs-9d9711544dc3090db6e5c52f9ce9c300bf4f5c14.tar.gz
Autogenerated HTML docs for v1.8.1-rc2-5-g252f9
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html530
1 files changed, 358 insertions, 172 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 4bb17c7dc..4dd95a97c 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -2,15 +2,25 @@
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<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.5.2" />
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
<title>git-rev-parse(1)</title>
<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
+
+/* Default font. */
+body {
+ font-family: Georgia,serif;
+}
+
+/* Title font. */
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+ font-family: Arial,Helvetica,sans-serif;
}
body {
@@ -35,13 +45,8 @@ strong {
color: #083194;
}
-tt {
- color: navy;
-}
-
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
- font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
@@ -59,9 +64,11 @@ h3 {
h3 + * {
clear: left;
}
+h5 {
+ font-size: 1.0em;
+}
div.sectionbody {
- font-family: serif;
margin-left: 0;
}
@@ -77,45 +84,48 @@ p {
ul, ol, li > p {
margin-top: 0;
}
+ul > li { color: #aaa; }
+ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
-span#author {
+
+#author {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
-span#email {
+#email {
}
-span#revnumber, span#revdate, span#revremark {
- font-family: sans-serif;
+#revnumber, #revdate, #revremark {
}
-div#footer {
- font-family: sans-serif;
+#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
-div#footer-text {
+#footer-text {
float: left;
padding-bottom: 0.5em;
}
-div#footer-badges {
+#footer-badges {
float: right;
padding-bottom: 0.5em;
}
-div#preamble {
+#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
@@ -135,7 +145,6 @@ div.content { /* Block element content. */
/* Block element titles. */
div.title, caption.title {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
@@ -157,13 +166,15 @@ div.content + div.title {
div.sidebarblock > div.content {
background: #ffffee;
- border: 1px solid silver;
+ border: 1px solid #dddddd;
+ border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
+ border: 1px solid #dddddd;
+ border-left: 5px solid #f0f0f0;
+ background: #f8f8f8;
padding: 0.5em;
}
@@ -171,8 +182,8 @@ div.quoteblock, div.verseblock {
padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
- border-left: 5px solid #dddddd;
- color: #777777;
+ border-left: 5px solid #f0f0f0;
+ color: #888;
}
div.quoteblock > div.attribution {
@@ -180,8 +191,9 @@ div.quoteblock > div.attribution {
text-align: right;
}
-div.verseblock > div.content {
- white-space: pre;
+div.verseblock > pre.content {
+ font-family: inherit;
+ font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
@@ -254,35 +266,12 @@ div.compact div, div.compact div {
margin-bottom: 0.1em;
}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-family: sans-serif;
- font-weight: bold;
-}
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.hdlist {
margin-top: 0.8em;
@@ -339,25 +328,32 @@ span.footnote, span.footnoteref {
min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
- div#footer-badges { display: none; }
+ #footer-badges { display: none; }
}
-div#toc {
+#toc {
margin-bottom: 2.5em;
}
-div#toctitle {
+#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 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -373,69 +369,173 @@ div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
-/* Overrides for manpage documents */
-h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
+
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+span.underline { text-decoration: underline; }
+span.overline { text-decoration: overline; }
+span.line-through { text-decoration: line-through; }
+
+div.unbreakable { page-break-inside: avoid; }
+
+
+/*
+ * xhtml11 specific
+ *
+ * */
+
+div.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-h2 {
+div.tableblock > table {
+ border: 3px solid #527bbd;
+}
+thead, p.table.header {
+ font-weight: bold;
+ color: #527bbd;
+}
+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.sectionbody {
- margin-left: 5%;
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
}
-
-@media print {
- div#toc { display: none; }
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
+/*
+ * html5 specific
+ *
+ * */
+
+table.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
+thead, p.tableblock.header {
font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
+ color: #527bbd;
+}
+p.tableblock {
+ margin-top: 0;
+}
+table.tableblock {
+ border-width: 3px;
+ border-spacing: 0px;
+ border-style: solid;
+ border-color: #527bbd;
+ border-collapse: collapse;
+}
+th.tableblock, td.tableblock {
+ border-width: 1px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #527bbd;
}
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
+table.tableblock.frame-topbot {
+ border-left-style: hidden;
+ border-right-style: hidden;
+}
+table.tableblock.frame-sides {
+ border-top-style: hidden;
+ border-bottom-style: hidden;
+}
+table.tableblock.frame-none {
+ border-style: hidden;
}
-div.quoteblock-attribution {
- padding-top: 0.5em;
+th.tableblock.halign-left, td.tableblock.halign-left {
+ text-align: left;
+}
+th.tableblock.halign-center, td.tableblock.halign-center {
+ text-align: center;
+}
+th.tableblock.halign-right, td.tableblock.halign-right {
text-align: right;
}
-div.verseblock-content {
- white-space: pre;
+th.tableblock.valign-top, td.tableblock.valign-top {
+ vertical-align: top;
}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+ vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+ vertical-align: bottom;
}
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+ border-style: none;
+}
+body.manpage div.sectionbody {
+ margin-left: 3em;
}
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
+@media print {
+ body.manpage div#toc { display: none; }
+}
+
+
</style>
<script type="text/javascript">
/*<![CDATA[*/
-window.onload = function(){asciidoc.footnotes();}
var asciidoc = { // Namespace.
/////////////////////////////////////////////////////////////////////
@@ -477,7 +577,7 @@ toc: function (toclevels) {
function tocEntries(el, toclevels) {
var result = new Array;
- var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -497,6 +597,25 @@ toc: function (toclevels) {
}
var toc = document.getElementById("toc");
+ if (!toc) {
+ return;
+ }
+
+ // Delete existing TOC entries in case we're reloading the TOC.
+ var tocEntriesToRemove = [];
+ var i;
+ for (i = 0; i < toc.childNodes.length; i++) {
+ var entry = toc.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div'
+ && entry.getAttribute("class")
+ && entry.getAttribute("class").match(/^toclevel/))
+ tocEntriesToRemove.push(entry);
+ }
+ for (i = 0; i < tocEntriesToRemove.length; i++) {
+ toc.removeChild(tocEntriesToRemove[i]);
+ }
+
+ // Rebuild TOC entries.
var entries = tocEntries(document.getElementById("content"), toclevels);
for (var i = 0; i < entries.length; ++i) {
var entry = entries[i];
@@ -524,24 +643,44 @@ toc: function (toclevels) {
*/
footnotes: function () {
- var cont = document.getElementById("content");
+ // Delete existing footnote entries in case we're reloading the footnodes.
+ var i;
var noteholder = document.getElementById("footnotes");
+ if (!noteholder) {
+ return;
+ }
+ var entriesToRemove = [];
+ for (i = 0; i < noteholder.childNodes.length; i++) {
+ var entry = noteholder.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ entriesToRemove.push(entry);
+ }
+ for (i = 0; i < entriesToRemove.length; i++) {
+ noteholder.removeChild(entriesToRemove[i]);
+ }
+
+ // Rebuild footnote entries.
+ var cont = document.getElementById("content");
var spans = cont.getElementsByTagName("span");
var refs = {};
var n = 0;
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnote") {
n++;
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ var note = spans[i].getAttribute("data-note");
+ if (!note) {
+ // Use [\s\S] in place of . so multi-line matches work.
+ // Because JavaScript has no s (dotall) regex flag.
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ spans[i].innerHTML =
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ spans[i].setAttribute("data-note", note);
+ }
noteholder.innerHTML +=
"<div class='footnote' id='_footnote_" + n + "'>" +
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
n + "</a>. " + note + "</div>";
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
@@ -561,13 +700,36 @@ footnotes: function () {
}
}
}
+},
+
+install: function(toclevels) {
+ var timerId;
+
+ function reinstall() {
+ asciidoc.footnotes();
+ if (toclevels) {
+ asciidoc.toc(toclevels);
+ }
+ }
+
+ function reinstallAndRemoveTimer() {
+ clearInterval(timerId);
+ reinstall();
+ }
+
+ timerId = setInterval(reinstall, 500);
+ if (document.addEventListener)
+ document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+ else
+ window.onload = reinstallAndRemoveTimer;
}
}
+asciidoc.install();
/*]]>*/
</script>
</head>
-<body>
+<body class="manpage">
<div id="header">
<h1>
git-rev-parse(1) Manual Page
@@ -580,13 +742,16 @@ git-rev-parse(1) Manual Page
</div>
</div>
<div id="content">
+<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content"><em>git rev-parse</em> [ --option ] &lt;args&gt;&#8230;</div>
-<div class="verseblock-attribution">
+<pre class="content"><em>git rev-parse</em> [ --option ] &lt;args&gt;&#8230;</pre>
+<div class="attribution">
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Many git porcelainish commands take mixture of flags
@@ -596,6 +761,8 @@ and flags and parameters for the other commands they use
downstream of <em>git rev-list</em>. This command is used to
distinguish between them.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -612,8 +779,8 @@ distinguish between them.</p></div>
</dt>
<dd>
<p>
- Only meaningful in <tt>--parseopt</tt> mode. Tells the option parser to echo
- out the first <tt>--</tt> met instead of skipping it.
+ Only meaningful in <code>--parseopt</code> mode. Tells the option parser to echo
+ out the first <code>--</code> met instead of skipping it.
</p>
</dd>
<dt class="hdlist1">
@@ -621,7 +788,7 @@ distinguish between them.</p></div>
</dt>
<dd>
<p>
- Only meaningful in <tt>--parseopt</tt> mode. Lets the option parser stop at
+ Only meaningful in <code>--parseopt</code> mode. Lets the option parser stop at
the first non-option argument. This can be used to parse sub-commands
that take options themselves.
</p>
@@ -632,7 +799,7 @@ distinguish between them.</p></div>
<dd>
<p>
Use <em>git rev-parse</em> in shell quoting mode (see SQ-QUOTE
- section below). In contrast to the <tt>--sq</tt> option below, this
+ section below). In contrast to the <code>--sq</code> option below, this
mode does only quoting. Nothing else is done to command input.
</p>
</dd>
@@ -675,7 +842,7 @@ distinguish between them.</p></div>
</dt>
<dd>
<p>
- If there is no parameter given by the user, use <tt>&lt;arg&gt;</tt>
+ If there is no parameter given by the user, use <code>&lt;arg&gt;</code>
instead.
</p>
</dd>
@@ -696,7 +863,7 @@ distinguish between them.</p></div>
</dt>
<dd>
<p>
- Only meaningful in <tt>--verify</tt> mode. Do not output an error
+ Only meaningful in <code>--verify</code> mode. Do not output an error
message if the first argument is not a valid object name;
instead exit with non-zero status silently.
</p>
@@ -710,8 +877,8 @@ distinguish between them.</p></div>
parameter. This option makes output a single line,
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
- <em>git diff-&#42;</em>). In contrast to the <tt>--sq-quote</tt> option,
+ newlines (e.g. when using pickaxe <code>-S</code> with
+ <em>git diff-&#42;</em>). In contrast to the <code>--sq-quote</code> option,
the command input is still interpreted as usual.
</p>
</dd>
@@ -774,7 +941,7 @@ distinguish between them.</p></div>
</dt>
<dd>
<p>
- Show all refs found in <tt>refs/</tt>.
+ Show all refs found in <code>refs/</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -789,23 +956,23 @@ distinguish between them.</p></div>
<dd>
<p>
Show all branches, tags, or remote-tracking branches,
- respectively (i.e., refs found in <tt>refs/heads</tt>,
- <tt>refs/tags</tt>, or <tt>refs/remotes</tt>, respectively).
+ respectively (i.e., refs found in <code>refs/heads</code>,
+ <code>refs/tags</code>, or <code>refs/remotes</code>, respectively).
</p>
-<div class="paragraph"><p>If a <tt>pattern</tt> is given, only refs matching the given shell glob are
-shown. If the pattern does not contain a globbing character (<tt>?</tt>,
-<tt>*</tt>, or <tt>[</tt>), it is turned into a prefix match by appending <tt>/*</tt>.</p></div>
+<div class="paragraph"><p>If a <code>pattern</code> is given, only refs matching the given shell glob are
+shown. If the pattern does not contain a globbing character (<code>?</code>,
+<code>*</code>, or <code>[</code>), it is turned into a prefix match by appending <code>/*</code>.</p></div>
</dd>
<dt class="hdlist1">
--glob=pattern
</dt>
<dd>
<p>
- Show all refs matching the shell glob pattern <tt>pattern</tt>. If
- the pattern does not start with <tt>refs/</tt>, this is automatically
+ Show all refs matching the shell glob pattern <code>pattern</code>. If
+ the pattern does not start with <code>refs/</code>, this is automatically
prepended. If the pattern does not contain a globbing
- character (<tt>?</tt>, <tt>*</tt>, or <tt>[</tt>), it is turned into a prefix
- match by appending <tt>/*</tt>.
+ character (<code>?</code>, <code>*</code>, or <code>[</code>), it is turned into a prefix
+ match by appending <code>/*</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -841,11 +1008,11 @@ shown. If the pattern does not contain a globbing character (<tt>?</tt>,
</dt>
<dd>
<p>
- Show <tt>$GIT_DIR</tt> if defined. Otherwise show the path to
+ Show <code>$GIT_DIR</code> if defined. Otherwise show the path to
the .git directory. The path shown, when relative, is
relative to the current working directory.
</p>
-<div class="paragraph"><p>If <tt>$GIT_DIR</tt> is not defined and the current directory
+<div class="paragraph"><p>If <code>$GIT_DIR</code> is not defined and the current directory
is not detected to lie in a git repository or work tree
print a message to stderr and exit with nonzero status.</p></div>
</dd>
@@ -943,6 +1110,8 @@ print a message to stderr and exit with nonzero status.</p></div>
</dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2>
<div class="sectionbody">
<div class="paragraph"><p>A revision parameter <em>&lt;rev&gt;</em> typically, but not necessarily, names a
@@ -968,7 +1137,7 @@ blobs contained in a commit.</p></div>
</dt>
<dd>
<p>
- Output from <tt>git describe</tt>; i.e. a closest tag, optionally
+ Output from <code>git describe</code>; i.e. a closest tag, optionally
followed by a dash and a number of commits, followed by a dash, a
<em>g</em>, and an abbreviated object name.
</p>
@@ -1019,15 +1188,15 @@ otherwise, <em>refs/remotes/&lt;refname&gt;/HEAD</em> if it exists.
</p>
<div class="paragraph"><p><em>HEAD</em> names the commit on which you based the changes in the working tree.
<em>FETCH_HEAD</em> records the branch which you fetched from a remote repository
-with your last <tt>git fetch</tt> invocation.
+with your last <code>git fetch</code> invocation.
<em>ORIG_HEAD</em> is created by commands that move your <em>HEAD</em> in a drastic
way, to record the position of the <em>HEAD</em> before their operation, so that
you can easily change the tip of the branch back to the state before you ran
them.
<em>MERGE_HEAD</em> records the commit(s) which you are merging into your branch
-when you run <tt>git merge</tt>.
+when you run <code>git merge</code>.
<em>CHERRY_PICK_HEAD</em> records the commit which you are cherry-picking
-when you run <tt>git cherry-pick</tt>.</p></div>
+when you run <code>git cherry-pick</code>.</p></div>
<div class="paragraph"><p>Note that any of the <em>refs/*</em> cases above may come either from
the <em>$GIT_DIR/refs</em> directory or from the <em>$GIT_DIR/packed-refs</em> file.
While the ref name encoding is unspecified, UTF-8 is prefered as
@@ -1209,7 +1378,7 @@ and C are parents of commit node A. Parent commits are ordered
left-to-right.</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>G H I J
+<pre><code>G H I J
\ / \ /
D E F
\ | / \
@@ -1218,11 +1387,11 @@ left-to-right.</p></div>
B C
\ /
\ /
- A</tt></pre>
+ A</code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt>A = = A^0
+<pre><code>A = = A^0
B = A^ = A^1 = A~1
C = A^2 = A^2
D = A^^ = A^1^1 = A~2
@@ -1231,12 +1400,14 @@ F = B^3 = A^^3
G = A^^^ = A^1^1^1 = A~3
H = D^2 = B^^2 = A^^^2 = A~2^2
I = F^ = B^3^ = A^^3^
-J = F^2 = B^3^2 = A^^3^2</tt></pre>
+J = F^2 = B^3^2 = A^^3^2</code></pre>
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_specifying_ranges">SPECIFYING RANGES</h2>
<div class="sectionbody">
-<div class="paragraph"><p>History traversing commands such as <tt>git log</tt> operate on a set
+<div class="paragraph"><p>History traversing commands such as <code>git log</code> 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
@@ -1326,7 +1497,7 @@ all of its parents.</p></div>
<div class="paragraph"><p>Here are a handful of examples:</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>D G H D
+<pre><code>D G H D
D F G H I J D F
^G D H D
^D B E I J F B
@@ -1336,70 +1507,73 @@ B...C G H D E B C
C I J F C
C^@ I J F
C^! C
-F^! D G H D F</tt></pre>
+F^! D G H D F</code></pre>
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_parseopt">PARSEOPT</h2>
<div class="sectionbody">
-<div class="paragraph"><p>In <tt>--parseopt</tt> mode, <em>git rev-parse</em> helps massaging options to bring to shell
+<div class="paragraph"><p>In <code>--parseopt</code> 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></div>
+(e.g. splits single switches aggregate values), a bit like <code>getopt(1)</code> does.</p></div>
<div class="paragraph"><p>It takes on the standard input the specification of the options to parse and
-understand, and echoes on the standard output a string suitable for <tt>sh(1)</tt> <tt>eval</tt>
+understand, and echoes on the standard output a string suitable for <code>sh(1)</code> <code>eval</code>
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></div>
-<div class="paragraph"><p>Note: Make sure you quote the result when passing it to <tt>eval</tt>. See
+<div class="paragraph"><p>Note: Make sure you quote the result when passing it to <code>eval</code>. See
below for an example.</p></div>
-<h3 id="_input_format">Input Format</h3><div style="clear:left"></div>
+<div class="sect2">
+<h3 id="_input_format">Input Format</h3>
<div class="paragraph"><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
+separated by a line that contains only <code>--</code>. The lines before the separator
(should be more than one) are used for the usage.
The lines after the separator describe the options.</p></div>
<div class="paragraph"><p>Each line of options has this format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>&lt;opt_spec&gt;&lt;flags&gt;* SP+ help LF</tt></pre>
+<pre><code>&lt;opt_spec&gt;&lt;flags&gt;* SP+ help LF</code></pre>
</div></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>&lt;opt_spec&gt;</tt>
+<code>&lt;opt_spec&gt;</code>
</dt>
<dd>
<p>
its format is the short option character, then the long option name
separated by a comma. Both parts are not required, though at least one
- is necessary. <tt>h,help</tt>, <tt>dry-run</tt> and <tt>f</tt> are all three correct
- <tt>&lt;opt_spec&gt;</tt>.
+ is necessary. <code>h,help</code>, <code>dry-run</code> and <code>f</code> are all three correct
+ <code>&lt;opt_spec&gt;</code>.
</p>
</dd>
<dt class="hdlist1">
-<tt>&lt;flags&gt;</tt>
+<code>&lt;flags&gt;</code>
</dt>
<dd>
<p>
- <tt>&lt;flags&gt;</tt> are of <tt>*</tt>, <tt>=</tt>, <tt>?</tt> or <tt>!</tt>.
+ <code>&lt;flags&gt;</code> are of <code>*</code>, <code>=</code>, <code>?</code> or <code>!</code>.
</p>
<div class="ulist"><ul>
<li>
<p>
-Use <tt>=</tt> if the option takes an argument.
+Use <code>=</code> if the option takes an argument.
</p>
</li>
<li>
<p>
-Use <tt>?</tt> to mean that the option is optional (though its use is discouraged).
+Use <code>?</code> to mean that the option is optional (though its use is discouraged).
</p>
</li>
<li>
<p>
-Use <tt>*</tt> to mean that this option should not be listed in the usage
- generated for the <tt>-h</tt> argument. It&#8217;s shown for <tt>--help-all</tt> as
+Use <code>*</code> to mean that this option should not be listed in the usage
+ generated for the <code>-h</code> argument. It&#8217;s shown for <code>--help-all</code> as
documented in <a href="gitcli.html">gitcli(7)</a>.
</p>
</li>
<li>
<p>
-Use <tt>!</tt> to not make the corresponding negated long option available.
+Use <code>!</code> to not make the corresponding negated long option available.
</p>
</li>
</ul></div>
@@ -1410,10 +1584,12 @@ as the help associated to the option.</p></div>
<div class="paragraph"><p>Blank lines are ignored, and lines that don&#8217;t match this specification are used
as option group headers (start the line with a space to create such
lines on purpose).</p></div>
-<h3 id="_example">Example</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_example">Example</h3>
<div class="listingblock">
<div class="content">
-<pre><tt>OPTS_SPEC="\
+<pre><code>OPTS_SPEC="\
some-command [options] &lt;args&gt;...
some-command does foo and bar!
@@ -1426,22 +1602,26 @@ bar= some cool option --bar with an argument
An option group Header
C? option C with an optional argument"
-eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"</tt></pre>
+eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"</code></pre>
</div></div>
</div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_sq_quote">SQ-QUOTE</h2>
<div class="sectionbody">
-<div class="paragraph"><p>In <tt>--sq-quote</tt> mode, <em>git rev-parse</em> echoes on the standard output a
-single line suitable for <tt>sh(1)</tt> <tt>eval</tt>. This line is made by
-normalizing the arguments following <tt>--sq-quote</tt>. Nothing other than
+<div class="paragraph"><p>In <code>--sq-quote</code> mode, <em>git rev-parse</em> echoes on the standard output a
+single line suitable for <code>sh(1)</code> <code>eval</code>. This line is made by
+normalizing the arguments following <code>--sq-quote</code>. Nothing other than
quoting the arguments is done.</p></div>
<div class="paragraph"><p>If you want command input to still be interpreted as usual by
-<em>git rev-parse</em> before the output is shell quoted, see the <tt>--sq</tt>
+<em>git rev-parse</em> before the output is shell quoted, see the <code>--sq</code>
option.</p></div>
-<h3 id="_example_2">Example</h3><div style="clear:left"></div>
+<div class="sect2">
+<h3 id="_example_2">Example</h3>
<div class="listingblock">
<div class="content">
-<pre><tt>$ cat &gt;your-git-script.sh &lt;&lt;\EOF
+<pre><code>$ cat &gt;your-git-script.sh &lt;&lt;\EOF
#!/bin/sh
args=$(git rev-parse --sq-quote "$@") # quote user-supplied arguments
command="git frotz -n24 $args" # and use it inside a handcrafted
@@ -1449,9 +1629,12 @@ command="git frotz -n24 $args" # and use it inside a handcrafted
eval "$command"
EOF
-$ sh your-git-script.sh "a b'c"</tt></pre>
+$ sh your-git-script.sh "a b'c"</code></pre>
</div></div>
</div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="ulist"><ul>
@@ -1461,7 +1644,7 @@ Print the object name of the current commit:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git rev-parse --verify HEAD</tt></pre>
+<pre><code>$ git rev-parse --verify HEAD</code></pre>
</div></div>
</li>
<li>
@@ -1470,7 +1653,7 @@ Print the commit object name from the revision in the $REV shell variable:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git rev-parse --verify $REV</tt></pre>
+<pre><code>$ git rev-parse --verify $REV</code></pre>
</div></div>
<div class="paragraph"><p>This will error out if $REV is empty or not a valid revision.</p></div>
</li>
@@ -1480,17 +1663,20 @@ Same as above:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git rev-parse --default master --verify $REV</tt></pre>
+<pre><code>$ git rev-parse --default master --verify $REV</code></pre>
</div></div>
<div class="paragraph"><p>but if $REV is empty, the commit object name from master will be printed.</p></div>
</li>
</ul></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
+</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">