From db450ba3ae2b636d553d185caf436c76c0853bff Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Sun, 21 Jan 2007 08:57:14 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc2

---
 cmds-mainporcelain.txt |  2 +-
 git-prune.html         | 30 ++++++------------------------
 git-prune.txt          |  9 ++++++++-
 git-rev-list.html      | 20 +++++++++++++++++++-
 git-rev-list.txt       | 17 +++++++++++++++++
 git-show-branch.html   | 17 +++++++++++++----
 git-show-branch.txt    | 15 ++++++++++++---
 git-tag.html           | 10 +++++-----
 git-tag.txt            |  8 ++++----
 git.html               |  4 ++--
 10 files changed, 87 insertions(+), 45 deletions(-)
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt
index 8184653ba..9a59c0305 100644
--- a/cmds-mainporcelain.txt
+++ b/cmds-mainporcelain.txt
@@ -92,5 +92,5 @@ gitlink:git-status[1]::
 	Show the working tree status.
 
 gitlink:git-tag[1]::
-	Create or verify a tag object signed with GPG.
+	Create, list, delete or verify a tag object signed with GPG.
 
diff --git a/git-prune.html b/git-prune.html
index a10f50f80..a479f1880 100644
--- a/git-prune.html
+++ b/git-prune.html
@@ -272,7 +272,7 @@ git-prune(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-prune</em> [-n] [--] [&lt;head&gt;&#8230;]</p>
+<p><em>git-prune</em> [-n] [--grace=&lt;time&gt;]</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -297,35 +297,17 @@ running <tt>git prune-packed</tt>.</p>
 </p>
 </dd>
 <dt>
---
+--grace=&lt;time&gt;
 </dt>
 <dd>
 <p>
-        Do not interpret any more arguments as options.
-</p>
-</dd>
-<dt>
-&lt;head&gt;&#8230;
-</dt>
-<dd>
-<p>
-        In addition to objects
-        reachable from any of our references, keep objects
-        reachable from listed &lt;head&gt;s.
+        Do not prune loose objects that are younger than the
+        specified time.  This gives a grace period to newly
+        created objects from getting pruned.
 </p>
 </dd>
 </dl>
 </div>
-<h2>EXAMPLE</h2>
-<div class="sectionbody">
-<p>To prune objects not used by your repository nor another that
-borrows from your repository via its
-<tt>.git/objects/info/alternates</tt>:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ git prune $(cd ../another &amp;&amp; $(git-rev-parse --all))</tt></pre>
-</div></div>
-</div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
@@ -340,7 +322,7 @@ borrows from your repository via its
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:18 UTC
+Last updated 21-Jan-2007 08:57:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-prune.txt b/git-prune.txt
index a11e30309..fbd344da4 100644
--- a/git-prune.txt
+++ b/git-prune.txt
@@ -8,7 +8,7 @@ git-prune - Prunes all unreachable objects from the object database
 
 SYNOPSIS
 --------
-'git-prune' [-n] [--] [<head>...]
+'git-prune' [-n] [--grace=<time>]
 
 DESCRIPTION
 -----------
@@ -28,6 +28,12 @@ OPTIONS
 	Do not remove anything; just report what it would
 	remove.
 
+--grace=<time>::
+	Do not prune loose objects that are younger than the
+	specified time.  This gives a grace period to newly
+	created objects from getting pruned.
+
+////////////////////////////////////////////
 \--::
 	Do not interpret any more arguments as options.
 
@@ -46,6 +52,7 @@ borrows from your repository via its
 ------------
 $ git prune $(cd ../another && $(git-rev-parse --all))
 ------------
+////////////////////////////////////////////
 
 Author
 ------
diff --git a/git-rev-list.html b/git-rev-list.html
index ecf560fe5..4c52d48e2 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -291,6 +291,7 @@ git-rev-list(1) Manual Page
              [ --pretty | --header ]
              [ --bisect ]
              [ --merge ]
+             [ --walk-reflogs ]
              &lt;commit&gt;&#8230; [ -- &lt;paths&gt;&#8230; ]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
@@ -658,6 +659,23 @@ limiting may be applied.</p>
 </p>
 </dd>
 <dt>
+--walk-reflogs
+</dt>
+<dd>
+<p>
+        Instead of walking the commit ancestry chain, walk
+        reflog entries from the most recent one to older ones.
+        When this option is used you cannot specify commits to
+        exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
+        nor <em>commit1&#8230;commit2</em> notations cannot be used).<br />
+With <em>--pretty</em> format other than oneline (for obvious reasons),
+this causes the output to have two extra lines of information
+used in the output.  When the starting commit is specified as
+instead.  Under <em>--pretty=oneline</em>, the commit message is
+prefixed with this information on the same line.
+</p>
+</dd>
+<dt>
 --merge
 </dt>
 <dd>
@@ -787,7 +805,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 31-Dec-2006 01:19:04 UTC
+Last updated 21-Jan-2007 08:57:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-list.txt b/git-rev-list.txt
index 86c94e7df..a996f6cb1 100644
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -27,6 +27,7 @@ SYNOPSIS
 	     [ \--pretty | \--header ]
 	     [ \--bisect ]
 	     [ \--merge ]
+	     [ \--walk-reflogs ]
 	     <commit>... [ \-- <paths>... ]
 
 DESCRIPTION
@@ -190,6 +191,22 @@ limiting may be applied.
 	In addition to the '<commit>' listed on the command
 	line, read them from the standard input.
 
+--walk-reflogs::
+
+	Instead of walking the commit ancestry chain, walk
+	reflog entries from the most recent one to older ones.
+	When this option is used you cannot specify commits to
+	exclude (that is, '{caret}commit', 'commit1..commit2',
+	nor 'commit1...commit2' notations cannot be used).
++
+With '\--pretty' format other than oneline (for obvious reasons),
+this causes the output to have two extra lines of information
+taken from the reflog.  By default, 'commit@{Nth}' notation is
+used in the output.  When the starting commit is specified as
+'commit@{now}', output also uses 'commit@{timestamp}' notation
+instead.  Under '\--pretty=oneline', the commit message is
+prefixed with this information on the same line.
+
 --merge::
 
 	After a failed merge, show refs that touch files having a
diff --git a/git-show-branch.html b/git-show-branch.html
index 936e44c9d..b9971bbfb 100644
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -276,7 +276,7 @@ git-show-branch(1) Manual Page
 <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;
-<em>git-show-branch</em> --reflog[=&lt;n&gt;] &lt;ref&gt;</div></div>
+<em>git-show-branch</em> --reflog[=&lt;n&gt;[,&lt;base&gt;]] [--list] &lt;ref&gt;</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -430,11 +430,13 @@ no &lt;rev&gt; nor &lt;glob&gt; is given on the command line.</p>
 </p>
 </dd>
 <dt>
---reflog[=&lt;n&gt;] &lt;ref&gt;
+--reflog[=&lt;n&gt;[,&lt;base&gt;]] &lt;ref&gt;
 </dt>
 <dd>
 <p>
-        Shows &lt;n&gt; most recent ref-log entries for the given ref.
+        Shows &lt;n&gt; most recent ref-log entries for the given
+        ref.  If &lt;base&gt; is given, &lt;n&gt; entries going back from
+        that entry.  &lt;base&gt; can be specified as count or date
 </p>
 </dd>
 </dl>
@@ -494,6 +496,13 @@ it, having the following in the configuration file may help:</p>
 <p>With this, <tt>git show-branch</tt> without extra parameters would show
 only the primary branches.  In addition, if you happen to be on
 your topic branch, it is shown as well.</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ git show-branch --reflog='10,1 hour ago' --list master</tt></pre>
+</div></div>
+<p>shows 10 reflog entries going back from the tip as of 1 hour ago.
+Without <tt>--list</tt>, the output also shows how these tips are
+topologically related with each other.</p>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
@@ -509,7 +518,7 @@ your topic branch, it is shown as well.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 26-Dec-2006 09:11:36 UTC
+Last updated 21-Jan-2007 08:57:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt
index 912e15bcb..529f3a648 100644
--- a/git-show-branch.txt
+++ b/git-show-branch.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git-show-branch' [--all] [--remotes] [--topo-order] [--current]
 		[--more=<n> | --list | --independent | --merge-base]
 		[--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
-'git-show-branch' --reflog[=<n>] <ref>
+'git-show-branch' --reflog[=<n>[,<base>]] [--list] <ref>
 
 DESCRIPTION
 -----------
@@ -97,8 +97,10 @@ OPTIONS
 	will show the revisions given by "git rev-list {caret}master
 	topic1 topic2"
 
---reflog[=<n>] <ref>::
-	Shows <n> most recent ref-log entries for the given ref.
+--reflog[=<n>[,<base>]] <ref>::
+	Shows <n> most recent ref-log entries for the given
+	ref.  If <base> is given, <n> entries going back from
+	that entry.  <base> can be specified as count or date
 
 
 Note that --more, --list, --independent and --merge-base options
@@ -165,6 +167,13 @@ With this, `git show-branch` without extra parameters would show
 only the primary branches.  In addition, if you happen to be on
 your topic branch, it is shown as well.
 
+------------
+$ git show-branch --reflog='10,1 hour ago' --list master
+------------
+
+shows 10 reflog entries going back from the tip as of 1 hour ago.
+Without `--list`, the output also shows how these tips are
+topologically related with each other.
 
 
 Author
diff --git a/git-tag.html b/git-tag.html
index 9b9b7a564..727ec47ce 100644
--- a/git-tag.html
+++ b/git-tag.html
@@ -266,15 +266,15 @@ git-tag(1) Manual Page
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-tag -
-   Create or verify a tag object signed with GPG
+   Create, list, delete or verify a tag object signed with GPG
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-tag</em> [-a | -s | -u &lt;key-id&gt;] [-f | -d | -v] [-m &lt;msg&gt; | -F &lt;file&gt;]
-         &lt;name&gt; [&lt;head&gt;]
+<div class="content"><em>git-tag</em> [-a | -s | -u &lt;key-id&gt;] [-f | -v] [-m &lt;msg&gt; | -F &lt;file&gt;]  &lt;name&gt; [&lt;head&gt;]
+<em>git-tag</em> -d &lt;name&gt;&#8230;
 <em>git-tag</em> -l [&lt;pattern&gt;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
@@ -337,7 +337,7 @@ if no pattern is given).</p>
 </dt>
 <dd>
 <p>
-        Delete an existing tag with the given name
+        Delete existing tags with the given names.
 </p>
 </dd>
 <dt>
@@ -390,7 +390,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 17-Jan-2007 17:42:18 UTC
+Last updated 21-Jan-2007 08:57:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-tag.txt b/git-tag.txt
index 8a71ab37d..13c7aefbf 100644
--- a/git-tag.txt
+++ b/git-tag.txt
@@ -3,14 +3,14 @@ git-tag(1)
 
 NAME
 ----
-git-tag - Create or verify a tag object signed with GPG
+git-tag - Create, list, delete or verify a tag object signed with GPG
 
 
 SYNOPSIS
 --------
 [verse]
-'git-tag' [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg> | -F <file>]
-	 <name> [<head>]
+'git-tag' [-a | -s | -u <key-id>] [-f | -v] [-m <msg> | -F <file>]  <name> [<head>]
+'git-tag' -d <name>...
 'git-tag' -l [<pattern>]
 
 DESCRIPTION
@@ -55,7 +55,7 @@ OPTIONS
 	Replace an existing tag with the given name (instead of failing)
 
 -d::
-	Delete an existing tag with the given name
+	Delete existing tags with the given names.
 
 -v::
 	Verify the gpg signature of given the tag
diff --git a/git.html b/git.html
index d866c98bf..6af03bef2 100644
--- a/git.html
+++ b/git.html
@@ -622,7 +622,7 @@ ancillary user utilities.</p>
 </dt>
 <dd>
 <p>
-        Create or verify a tag object signed with GPG.
+        Create, list, delete or verify a tag object signed with GPG.
 </p>
 </dd>
 </dl>
@@ -2285,7 +2285,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-Jan-2007 02:22:41 UTC
+Last updated 21-Jan-2007 08:57:05 UTC
 </div>
 </div>
 </body>
-- 
2.26.2

