From: Junio C Hamano <junio@hera.kernel.org>
Date: Sat, 23 Dec 2006 10:29:52 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.4.3-g6be93
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30e1db15139610fc3147dbaab1234da67625c152;p=git.git

Autogenerated HTML docs for v1.4.4.3-g6be93
---

diff --git a/git-show-branch.html b/git-show-branch.html
index 1bc5993db..13e5eb309 100644
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -273,7 +273,7 @@ git-show-branch(1) Manual Page
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-show-branch</em> [--all] [--heads] [--tags] [--topo-order] [--current]
+<div class="content"><em>git-show-branch</em> [--all] [--remotes] [--topo-order] [--current]
                 [--more=&lt;n&gt; | --list | --independent | --merge-base]
                 [--no-name | --sha1-name] [--topics] [&lt;rev&gt; | &lt;glob&gt;]&#8230;</div></div>
 </div>
@@ -310,12 +310,19 @@ no &lt;rev&gt; nor &lt;glob&gt; is given on the command line.</p>
 </p>
 </dd>
 <dt>
---all --heads --tags
+-r|--remotes
 </dt>
 <dd>
 <p>
-        Show all refs under $GIT_DIR/refs, $GIT_DIR/refs/heads,
-        and $GIT_DIR/refs/tags, respectively.
+        Show the remote-tracking branches.
+</p>
+</dd>
+<dt>
+-a|--all
+</dt>
+<dd>
+<p>
+        Show both remote-tracking branches and local branches.
 </p>
 </dd>
 <dt>
@@ -493,7 +500,7 @@ your topic branch, it is shown as well.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Dec-2006 00:54:32 UTC
+Last updated 23-Dec-2006 10:29:46 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt
index 948ff10e6..dafacd430 100644
--- a/git-show-branch.txt
+++ b/git-show-branch.txt
@@ -8,7 +8,7 @@ git-show-branch - Show branches and their commits
 SYNOPSIS
 --------
 [verse]
-'git-show-branch' [--all] [--heads] [--tags] [--topo-order] [--current]
+'git-show-branch' [--all] [--remotes] [--topo-order] [--current]
 		[--more=<n> | --list | --independent | --merge-base]
 		[--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
 
@@ -37,9 +37,11 @@ OPTIONS
 	branches under $GIT_DIR/refs/heads/topic, giving
 	`topic/*` would show all of them.
 
---all --heads --tags::
-	Show all refs under $GIT_DIR/refs, $GIT_DIR/refs/heads,
-	and $GIT_DIR/refs/tags, respectively.
+-r|--remotes::
+	Show the remote-tracking branches.
+
+-a|--all::
+	Show both remote-tracking branches and local branches.
 
 --current::
 	With this option, the command includes the current