summaryrefslogtreecommitdiffstats
path: root/git-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-12-22 07:28:18 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-12-22 07:28:18 +0000
commit63ef0ac13e411afbeaaf0ff1f279affbb8614188 (patch)
tree504ea9a31de3f6cf1b2107753f8f800d53837225 /git-branch.html
parent4bf6dca5740a97dca7ed3a80bcae9fd983881bb6 (diff)
downloadgit-htmldocs-63ef0ac13e411afbeaaf0ff1f279affbb8614188.tar.gz
Autogenerated HTML docs for v1.4.4.3-gfa39b
Diffstat (limited to 'git-branch.html')
-rw-r--r--git-branch.html19
1 files changed, 13 insertions, 6 deletions
diff --git a/git-branch.html b/git-branch.html
index 74a4e26d1..f9cf223ad 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -276,7 +276,7 @@ git-branch(1) Manual Page
<div class="content"><em>git-branch</em> [-r | -a] [-v [--abbrev=&lt;length&gt;]]
<em>git-branch</em> [-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) &lt;branchname&gt;&#8230;</div></div>
+<em>git-branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -295,7 +295,8 @@ renaming. If &lt;newbranch&gt; exists, -M must be used to force the rename
to happen.</p>
<p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt>&lt;branchname&gt;</tt> will be deleted. You may
specify more than one branch for deletion. If the branch currently
-has a ref log then the ref log will also be deleted.</p>
+has a ref log then the ref log will also be deleted. Use -r together with -d
+to delete remote-tracking branches.</p>
</div>
<h2>OPTIONS</h2>
<div class="sectionbody">
@@ -355,7 +356,7 @@ has a ref log then the ref log will also be deleted.</p>
</dt>
<dd>
<p>
- List the remote-tracking branches.
+ List or delete (if used with -d) the remote-tracking branches.
</p>
</dd>
<dt>
@@ -454,12 +455,18 @@ Delete unneeded branch
<div class="content">
<pre><tt>$ git clone git://git.kernel.org/.../git.git my.git
$ cd my.git
-$ git branch -D todo <b>(1)</b></tt></pre>
+$ git branch -d -r todo html man <b>(1)</b>
+$ git branch -D test <b>(2)</b></tt></pre>
</div></div>
<ol>
<li>
<p>
-delete todo branch even if the "master" branch does not have all
+delete remote-tracking branches "todo", "html", "man"
+</p>
+</li>
+<li>
+<p>
+delete "test" branch even if the "master" branch does not have all
commits from todo branch.
</p>
</li>
@@ -487,7 +494,7 @@ a branch and check it out with a single command.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 13-Dec-2006 21:32:04 UTC
+Last updated 22-Dec-2006 07:28:11 UTC
</div>
</div>
</body>