Autogenerated HTML docs for v1.4.4.2-g8336

diff --git a/config.txt b/config.txt
index ceac54b024bd407f3c3d3079f6164b3d61401da3..22482d6a94e88544935eee5f560089b9a4bf0dfa 100644 (file)
--- 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 dd411c6333d0e690d092c2ac3eb9fc7326dc713b..c3bd8ea5ad1031fd8ee07f3c92a6bb1fde69c67f 100644 (file)
--- 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"\r
         renames = true</tt></pre>\r
 </div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>[branch "devel"]\r
+        remote = origin\r
+        merge = refs/heads/devel</tt></pre>\r
+</div></div>\r
 <h3>Variables</h3>\r
 <p>Note that this list is non-comprehensive and not necessarily complete.\r
 For command-specific variables, you will find a more detailed description\r
@@ -1161,7 +1167,7 @@ receive.denyNonFastForwards
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2006 07:43:51 UTC\r
+Last updated 19-Dec-2006 00:54:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-branch.html b/git-show-branch.html
index 631912bc5603adbecc3abe5d3f97cdbd5b58bfab..1bc5993db8d3d60fda4cf4e67059b548c6a69a39 100644 (file)
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -275,7 +275,7 @@ git-show-branch(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-show-branch</em> [--all] [--heads] [--tags] [--topo-order] [--current]\r
                 [--more=&lt;n&gt; | --list | --independent | --merge-base]\r
-                [--no-name | --sha1-name] [&lt;rev&gt; | &lt;glob&gt;]&#8230;</div></div>\r
+                [--no-name | --sha1-name] [--topics] [&lt;rev&gt; | &lt;glob&gt;]&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -408,6 +408,19 @@ no &lt;rev&gt; nor &lt;glob&gt; is given on the command line.</p>
         object names.\r
 </p>\r
 </dd>\r
+<dt>\r
+--topics\r
+</dt>\r
+<dd>\r
+<p>\r
+        Shows only commits that are NOT on the first branch given.\r
+        This helps track topic branches by hiding any commit that\r
+        is already in the main line of development.  When given\r
+        "git show-branch --topics master topic1 topic2", this\r
+        will show the revisions given by "git rev-list ^master\r
+        topic1 topic2"\r
+</p>\r
+</dd>\r
 </dl>\r
 <p>Note that --more, --list, --independent and --merge-base options\r
 are mutually exclusive.</p>\r
@@ -480,7 +493,7 @@ your topic branch, it is shown as well.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:28 UTC\r
+Last updated 19-Dec-2006 00:54:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-branch.txt b/git-show-branch.txt
index a2445a48fc98ddd4865bab8d3033880a854fca36..948ff10e6c83b8842de453e798ff7916ac98d911 100644 (file)
--- 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.