summaryrefslogtreecommitdiffstats
path: root/git-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-15 15:49:03 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-15 15:49:03 +0000
commit38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (patch)
treebc44e0dbf17d91c4eec1fdc57bafcec5a15f74dc /git-branch.html
parentc4b18dd00515b271e8b4e4725ce0d19c4ca41636 (diff)
downloadgit-htmldocs-38ddcce0c19a8eedec7a98bd291f65b2127a82b9.tar.gz
Autogenerated HTML docs for v1.5.6.3-350-g6c11a
Diffstat (limited to 'git-branch.html')
-rw-r--r--git-branch.html27
1 files changed, 14 insertions, 13 deletions
diff --git a/git-branch.html b/git-branch.html
index 6365ba299..d0c3c5e56 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -321,24 +321,25 @@ git-branch(1) Manual Page
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged]
- [-v [--abbrev=&lt;length&gt; | --no-abbrev]]
- [--contains &lt;commit&gt;]
+<div class="content"><em>git branch</em> [--color | --no-color] [-r | -a]
+ [-v [--abbrev=&lt;length&gt; | --no-abbrev]]
+ [(--merged | --no-merged | --contains) [&lt;commit&gt;]]
<em>git branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
<em>git branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;
<em>git branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<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.
-With <tt>--contains &lt;commit&gt;</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></div>
+<div class="para"><p>With no arguments, existing branches are listed, 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.</p></div>
+<div class="para"><p>With <tt>--contains</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 the named
+commit (i.e. the branches whose tip commits are reachable from the named
+commit) will be listed. With <tt>--no-merged</tt> only branches not merged into
+the named commit will be listed. Missing &lt;commit&gt; argument defaults to
+<em>HEAD</em> (i.e. the tip of the current branch).</p></div>
<div class="para"><p>In its second form, a new branch named &lt;branchname&gt; will be created.
It will start out with a head equal to the one given as &lt;start-point&gt;.
If no &lt;start-point&gt; is given, the branch will be created with a head
@@ -664,7 +665,7 @@ but different purposes:</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:36 UTC
+Last updated 2008-07-15 15:48:34 UTC
</div>
</div>
</body>