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-branch.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-branch.html')
| -rw-r--r-- | git-show-branch.html | 140 |
1 files changed, 94 insertions, 46 deletions
diff --git a/git-show-branch.html b/git-show-branch.html index 596ea4012..d34d82fdd 100644 --- a/git-show-branch.html +++ b/git-show-branch.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-branch(1)</title>
</head>
@@ -278,18 +326,18 @@ git-show-branch(1) Manual Page [--no-name | --sha1-name] [--topics] [<rev> | <glob>]…
<em>git show-branch</em> (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]</div></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>Shows the commit ancestry graph starting from the commits named
+<div class="para"><p>Shows the commit ancestry graph starting from the commits named
with <rev>s or <globs>s (or all refs under $GIT_DIR/refs/heads
-and/or $GIT_DIR/refs/tags) semi-visually.</p>
-<p>It cannot show more than 29 branches and commits at a time.</p>
-<p>It uses <tt>showbranch.default</tt> multi-valued configuration items if
-no <rev> nor <glob> is given on the command line.</p>
+and/or $GIT_DIR/refs/tags) semi-visually.</p></div>
+<div class="para"><p>It cannot show more than 29 branches and commits at a time.</p></div>
+<div class="para"><p>It uses <tt>showbranch.default</tt> multi-valued configuration items if
+no <rev> nor <glob> is given on the command line.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
<rev>
</dt>
@@ -390,7 +438,7 @@ no <rev> nor <glob> is given on the command line.</p> <dd>
<p>
Instead of showing the commit list, just act like the
- <tt>git-merge-base -a</tt> command, except that it can accept
+ <em>git-merge-base -a</em> command, except that it can accept
more than two heads.
</p>
</dd>
@@ -448,24 +496,24 @@ no <rev> nor <glob> is given on the command line.</p> current branch (or <tt>HEAD</tt> if it is detached).
</p>
</dd>
-</dl>
-<p>Note that --more, --list, --independent and --merge-base options
-are mutually exclusive.</p>
+</dl></div>
+<div class="para"><p>Note that --more, --list, --independent and --merge-base options
+are mutually exclusive.</p></div>
</div>
-<h2>OUTPUT</h2>
+<h2 id="_output">OUTPUT</h2>
<div class="sectionbody">
-<p>Given N <references>, the first N lines are the one-line
+<div class="para"><p>Given N <references>, the first N lines are the one-line
description from their commit message. The branch head that is
pointed at by $GIT_DIR/HEAD is prefixed with an asterisk <tt>*</tt>
-character while other heads are prefixed with a <tt>!</tt> character.</p>
-<p>Following these N lines, one-line log for each commit is
+character while other heads are prefixed with a <tt>!</tt> character.</p></div>
+<div class="para"><p>Following these N lines, one-line log for each commit is
displayed, indented N places. If a commit is on the I-th
branch, the I-th indentation character shows a <tt>+</tt> sign;
otherwise it shows a space. Merge commits are denoted by
a <tt>-</tt> sign. Each commit shows a short name that
-can be used as an extended SHA1 to name that commit.</p>
-<p>The following example shows three branches, "master", "fixes"
-and "mhf":</p>
+can be used as an extended SHA1 to name that commit.</p></div>
+<div class="para"><p>The following example shows three branches, "master", "fixes"
+and "mhf":</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git show-branch master fixes mhf
@@ -485,16 +533,16 @@ and "mhf":</p> + [mhf~8] Start adding the $GIT_DIR/remotes/ support.
*++ [master] Add 'git show-branch'.</tt></pre>
</div></div>
-<p>These three branches all forked from a common commit, [master],
+<div class="para"><p>These three branches all forked from a common commit, [master],
whose commit message is "Add <em>git show-branch</em>. "fixes" branch
adds one commit <em>Introduce "reset type"</em>. "mhf" branch has many
-other commits. The current branch is "master".</p>
+other commits. The current branch is "master".</p></div>
</div>
-<h2>EXAMPLE</h2>
+<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
-<p>If you keep your primary branches immediately under
+<div class="para"><p>If you keep your primary branches immediately under
<tt>$GIT_DIR/refs/heads</tt>, and topic branches in subdirectories of
-it, having the following in the configuration file may help:</p>
+it, having the following in the configuration file may help:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>[showbranch]
@@ -502,32 +550,32 @@ it, having the following in the configuration file may help:</p> default = heads/*
</tt></pre>
</div></div>
-<p>With this, <tt>git show-branch</tt> without extra parameters would show
+<div class="para"><p>With this, <tt>git show-branch</tt> without extra parameters would show
only the primary branches. In addition, if you happen to be on
-your topic branch, it is shown as well.</p>
+your topic branch, it is shown as well.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git show-branch --reflog='10,1 hour ago' --list master</tt></pre>
</div></div>
-<p>shows 10 reflog entries going back from the tip as of 1 hour ago.
+<div class="para"><p>shows 10 reflog entries going back from the tip as of 1 hour ago.
Without <tt>--list</tt>, the output also shows how these tips are
-topologically related with each other.</p>
+topologically related with each other.</p></div>
</div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Junio C Hamano <junkio@cox.net></p>
+<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by Junio C Hamano.</p>
+<div class="para"><p>Documentation by Junio C Hamano.</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:02 UTC
+Last updated 2008-07-06 05:17:02 UTC
</div>
</div>
</body>
|