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-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-branch.html')
| -rw-r--r-- | git-branch.html | 156 |
1 files changed, 102 insertions, 54 deletions
diff --git a/git-branch.html b/git-branch.html index 2c1f8878e..6365ba299 100644 --- a/git-branch.html +++ b/git-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-branch(1)</title>
</head>
@@ -280,9 +328,9 @@ git-branch(1) Manual Page <em>git branch</em> (-m | -M) [<oldbranch>] <newbranch>
<em>git branch</em> (-d | -D) [-r] <branchname>…</div></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>With no arguments given a list of existing branches
+<div class="para"><p>With no arguments given a list of existing branches
will be shown, the current branch will be highlighted with an asterisk.
Option <tt>-r</tt> causes the remote-tracking branches to be listed,
and option <tt>-a</tt> shows both.
@@ -290,36 +338,36 @@ With <tt>--contains <commit></tt>, shows only the branches that contains the named commit (in other words, the branches whose
tip commits are descendant of the named commit).
With <tt>--merged</tt>, only branches merged into HEAD will be listed, and
-with <tt>--no-merged</tt> only branches not merged into HEAD will be listed.</p>
-<p>In its second form, a new branch named <branchname> will be created.
+with <tt>--no-merged</tt> only branches not merged into HEAD will be listed.</p></div>
+<div class="para"><p>In its second form, a new branch named <branchname> will be created.
It will start out with a head equal to the one given as <start-point>.
If no <start-point> is given, the branch will be created with a head
-equal to that of the currently checked out branch.</p>
-<p>Note that this will create the new branch, but it will not switch the
+equal to that of the currently checked out branch.</p></div>
+<div class="para"><p>Note that this will create the new branch, but it will not switch the
working tree to it; use "git checkout <newbranch>" to switch to the
-new branch.</p>
-<p>When a local branch is started off a remote branch, git sets up the
-branch so that <tt>git-pull</tt> will appropriately merge from
+new branch.</p></div>
+<div class="para"><p>When a local branch is started off a remote branch, git sets up the
+branch so that <em>git-pull</em> will appropriately merge from
the remote branch. This behavior may be changed via the global
<tt>branch.autosetupmerge</tt> configuration flag. That setting can be
-overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p>
-<p>With a <em>-m</em> or <em>-M</em> option, <oldbranch> will be renamed to <newbranch>.
+overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p></div>
+<div class="para"><p>With a <em>-m</em> or <em>-M</em> option, <oldbranch> will be renamed to <newbranch>.
If <oldbranch> had a corresponding reflog, it is renamed to match
<newbranch>, and a reflog entry is created to remember the branch
renaming. If <newbranch> exists, -M must be used to force the rename
-to happen.</p>
-<p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt><branchname></tt> will be deleted. You may
+to happen.</p></div>
+<div class="para"><p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt><branchname></tt> will be deleted. You may
specify more than one branch for deletion. If the branch currently
-has a reflog then the reflog will also be deleted.</p>
-<p>Use -r together with -d to delete remote-tracking branches. Note, that it
+has a reflog then the reflog will also be deleted.</p></div>
+<div class="para"><p>Use -r together with -d to delete remote-tracking branches. Note, that it
only makes sense to delete remote-tracking branches if they no longer exist
-in remote repository or if <tt>git-fetch</tt> was configured not to fetch
+in remote repository or if <em>git-fetch</em> was configured not to fetch
them again. See also <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for way to
-clean up all obsolete remote-tracking branches.</p>
+clean up all obsolete remote-tracking branches.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
-d
</dt>
@@ -437,14 +485,14 @@ clean up all obsolete remote-tracking branches.</p> </dt>
<dd>
<p>
- When creating a new branch, set up configuration so that <tt>git-pull</tt>
+ When creating a new branch, set up configuration so that <em>git-pull</em>
will automatically retrieve data from the start point, which must be
a branch. Use this if you always pull from the same upstream branch
into the new branch, and if you don't want to use "git pull
<repository> <refspec>" explicitly. This behavior is the default
when the start point is a remote branch. Set the
branch.autosetupmerge configuration variable to <tt>false</tt> if you want
- <tt>git-checkout</tt> and <tt>git-branch</tt> to always behave as if <em>--no-track</em> were
+ <em>git-checkout</em> and <em>git-branch</em> to always behave as if <em>--no-track</em> were
given. Set it to <tt>always</tt> if you want this behavior when the
start-point is either a local or remote branch.
</p>
@@ -519,11 +567,11 @@ clean up all obsolete remote-tracking branches.</p> <branchname> applies.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Examples</h2>
+<h2 id="_examples">Examples</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
Start development off of a known tag
</dt>
@@ -535,14 +583,14 @@ $ cd my2.6 $ git branch my2.6.14 v2.6.14 <b>(1)</b>
$ git checkout my2.6.14</tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
This step and the next one could be combined into a single step with
"checkout -b my2.6.14 v2.6.14".
</p>
</li>
-</ol>
+</ol></div>
</dd>
<dt>
Delete unneeded branch
@@ -555,7 +603,7 @@ $ cd my.git $ git branch -d -r origin/todo origin/html origin/man <b>(1)</b>
$ git branch -D test <b>(2)</b></tt></pre>
</div></div>
-<ol>
+<div class="colist"><ol>
<li>
<p>
Delete remote-tracking branches "todo", "html", "man". Next <em>fetch</em> or
@@ -569,18 +617,18 @@ Delete "test" branch even if the "master" branch (or whichever branch is currently checked out) does not have all commits from test branch.
</p>
</li>
-</ol>
+</ol></div>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Notes</h2>
+<h2 id="_notes">Notes</h2>
<div class="sectionbody">
-<p>If you are creating a branch that you want to immediately checkout, it's
+<div class="para"><p>If you are creating a branch that you want to immediately checkout, it's
easier to use the git checkout command with its <tt>-b</tt> option to create
-a branch and check it out with a single command.</p>
-<p>The options <tt>--contains</tt>, <tt>--merged</tt> and <tt>--no-merged</tt> serves three related
-but different purposes:</p>
-<ul>
+a branch and check it out with a single command.</p></div>
+<div class="para"><p>The options <tt>--contains</tt>, <tt>--merged</tt> and <tt>--no-merged</tt> serves three related
+but different purposes:</p></div>
+<div class="ilist"><ul>
<li>
<p>
<tt>--contains <commit></tt> is used to find all branches which will need
@@ -600,23 +648,23 @@ but different purposes:</p> into HEAD, since those branches are not fully contained by HEAD.
</p>
</li>
-</ul>
+</ul></div>
</div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net></p>
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and 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 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:01:33 UTC
+Last updated 2008-07-06 05:16:36 UTC
</div>
</div>
</body>
|