From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 19 Dec 2006 00:54:38 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.4.2-g8336
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52401ef95b10bdca548a3fb8f18743b27368ab25;p=git.git

Autogenerated HTML docs for v1.4.4.2-g8336
---

diff --git a/config.txt b/config.txt
index ceac54b02..22482d6a9 100644
--- a/config.txt
+++ b/config.txt
@@ -31,6 +31,11 @@ Example
 		external = "/usr/local/bin/gnu-diff -u"
 		renames = true
 
+	[branch "devel"]
+		remote = origin
+		merge = refs/heads/devel
+
+
 Variables
 ~~~~~~~~~
 
diff --git a/git-repo-config.html b/git-repo-config.html
index dd411c633..c3bd8ea5a 100644
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -588,6 +588,12 @@ enclosed in double quotes; some variables may require special value format.</p>
         external = "/usr/local/bin/gnu-diff -u"
         renames = true</tt></pre>
 </div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>[branch "devel"]
+        remote = origin
+        merge = refs/heads/devel</tt></pre>
+</div></div>
 <h3>Variables</h3>
 <p>Note that this list is non-comprehensive and not necessarily complete.
 For command-specific variables, you will find a more detailed description
@@ -1161,7 +1167,7 @@ receive.denyNonFastForwards
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 16-Dec-2006 07:43:51 UTC
+Last updated 19-Dec-2006 00:54:31 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.html b/git-show-branch.html
index 631912bc5..1bc5993db 100644
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -275,7 +275,7 @@ git-show-branch(1) Manual Page
 <div class="verseblock">
 <div class="content"><em>git-show-branch</em> [--all] [--heads] [--tags] [--topo-order] [--current]
                 [--more=&lt;n&gt; | --list | --independent | --merge-base]
-                [--no-name | --sha1-name] [&lt;rev&gt; | &lt;glob&gt;]&#8230;</div></div>
+                [--no-name | --sha1-name] [--topics] [&lt;rev&gt; | &lt;glob&gt;]&#8230;</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -408,6 +408,19 @@ no &lt;rev&gt; nor &lt;glob&gt; is given on the command line.</p>
         object names.
 </p>
 </dd>
+<dt>
+--topics
+</dt>
+<dd>
+<p>
+        Shows only commits that are NOT on the first branch given.
+        This helps track topic branches by hiding any commit that
+        is already in the main line of development.  When given
+        "git show-branch --topics master topic1 topic2", this
+        will show the revisions given by "git rev-list ^master
+        topic1 topic2"
+</p>
+</dd>
 </dl>
 <p>Note that --more, --list, --independent and --merge-base options
 are mutually exclusive.</p>
@@ -480,7 +493,7 @@ your topic branch, it is shown as well.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:28 UTC
+Last updated 19-Dec-2006 00:54:32 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt
index a2445a48f..948ff10e6 100644
--- a/git-show-branch.txt
+++ b/git-show-branch.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git-show-branch' [--all] [--heads] [--tags] [--topo-order] [--current]
 		[--more=<n> | --list | --independent | --merge-base]
-		[--no-name | --sha1-name] [<rev> | <glob>]...
+		[--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
 
 DESCRIPTION
 -----------
@@ -86,6 +86,14 @@ OPTIONS
 	of "master"), name them with the unique prefix of their
 	object names.
 
+--topics::
+	Shows only commits that are NOT on the first branch given.
+	This helps track topic branches by hiding any commit that
+	is already in the main line of development.  When given
+	"git show-branch --topics master topic1 topic2", this
+	will show the revisions given by "git rev-list {caret}master
+	topic1 topic2"
+
 Note that --more, --list, --independent and --merge-base options
 are mutually exclusive.