Autogenerated HTML docs for v1.5.3.6-970-gd25430

1 files changed, 14 insertions, 8 deletions

diff --git a/git-branch.html b/git-branch.html
index de381c0e4..9fdf7997b 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -305,8 +305,12 @@ 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>&lt;branchname&gt;</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. Use -r together with -d

-to delete remote-tracking branches.</p>

+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

+only makes sense to delete remote-tracking branches if they no longer exist

+in remote repository or if <a href="git-fetch.html">git-fetch(1)</a> 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>

 </div>

 <h2>OPTIONS</h2>

 <div class="sectionbody">

@@ -316,7 +320,7 @@ to delete remote-tracking branches.</p>
 </dt>

 <dd>

 <p>

-        Delete a branch. The branch must be fully merged.

+        Delete a branch. The branch must be fully merged in HEAD.

 </p>

 </dd>

 <dt>

@@ -324,7 +328,7 @@ to delete remote-tracking branches.</p>
 </dt>

 <dd>

 <p>

-        Delete a branch irrespective of its index status.

+        Delete a branch irrespective of its merged status.

 </p>

 </dd>

 <dt>

@@ -522,13 +526,15 @@ $ git branch -D test                                    <b>(2)</b></tt></pre>
 <ol>

 <li>

 <p>

-Delete remote-tracking branches "todo", "html", "man"

+Delete remote-tracking branches "todo", "html", "man". Next <em>fetch</em> or

+<em>pull</em> will create them again unless you configure them not to. See

+<a href="git-fetch.html">git-fetch(1)</a>.

 </p>

 </li>

 <li>

 <p>

-Delete "test" branch even if the "master" branch does not have all

-commits from test branch.

+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>

@@ -555,7 +561,7 @@ a branch and check it out with a single command.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 14-Nov-2007 12:11:22 UTC

+Last updated 29-Nov-2007 02:27:34 UTC

 </div>

 </div>

 </body>