Autogenerated HTML docs for v1.5.0-rc2-g18af

diff --git a/git-gc.html b/git-gc.html
index 28112861a4bbd85be63f16a6d07071ac1b6d9086..3391f6627ee587c3e8a302ac2c3dea3756fcfe9b 100644 (file)
--- a/git-gc.html
+++ b/git-gc.html
@@ -272,7 +272,7 @@ git-gc(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-gc</em></p>\r
+<p><em>git-gc</em> [--prune]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -284,6 +284,27 @@ created from prior invocations of <a href="git-add.html">git-add(1)</a>.</p>
 each repository to maintain good disk space utilization and good\r
 operating performance.</p>\r
 </div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+--prune\r
+</dt>\r
+<dd>\r
+<p>\r
+        Usually <tt>git-gc</tt> packs refs, expires old reflog entries,\r
+        packs loose objects,\r
+        and removes old <em>rerere</em> records.  Removal\r
+        of unreferenced loose objects is an unsafe operation\r
+        while other git operations are in progress, so it is not\r
+        done by default.  Pass this option if you want it, and only\r
+        when you know nobody else is creating new objects in the\r
+        repository at the same time (e.g. never use this option\r
+        in a cron script).\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
 <h2>Configuration</h2>\r
 <div class="sectionbody">\r
 <p>The optional configuration variable <em>gc.reflogExpire</em> can be\r
@@ -323,7 +344,7 @@ kept.  This defaults to 15 days.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Jan-2007 17:42:14 UTC\r
+Last updated 22-Jan-2007 08:59:52 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-gc.txt b/git-gc.txt
index 2bcc9491a3a985a62d86dc93d83b217f0220e3dc..e37758ad15823c81d18ccc06fa4dc8775744cdcd 100644 (file)
--- a/git-gc.txt
+++ b/git-gc.txt
@@ -8,7 +8,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository
 
 SYNOPSIS
 --------
-'git-gc'
+'git-gc' [--prune]
 
 DESCRIPTION
 -----------
@@ -21,6 +21,21 @@ Users are encouraged to run this task on a regular basis within
 each repository to maintain good disk space utilization and good
 operating performance.
 
+OPTIONS
+-------
+
+--prune::
+       Usually `git-gc` packs refs, expires old reflog entries,
+       packs loose objects,
+       and removes old 'rerere' records.  Removal
+       of unreferenced loose objects is an unsafe operation
+       while other git operations are in progress, so it is not
+       done by default.  Pass this option if you want it, and only
+       when you know nobody else is creating new objects in the
+       repository at the same time (e.g. never use this option
+       in a cron script).
+
+
 Configuration
 -------------
 

diff --git a/git-prune.html b/git-prune.html
index a479f18806e23553b134cc97f086399208814aa9..bc891332041535adfabbde568a73039cb2cf0900 100644 (file)
--- a/git-prune.html
+++ b/git-prune.html
@@ -272,7 +272,7 @@ git-prune(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-prune</em> [-n] [--grace=&lt;time&gt;]</p>\r
+<p><em>git-prune</em> [-n] [--] [&lt;head&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -297,17 +297,35 @@ running <tt>git prune-packed</tt>.</p>
 </p>\r
 </dd>\r
 <dt>\r
---grace=&lt;time&gt;\r
+--\r
 </dt>\r
 <dd>\r
 <p>\r
-        Do not prune loose objects that are younger than the\r
-        specified time.  This gives a grace period to newly\r
-        created objects from getting pruned.\r
+        Do not interpret any more arguments as options.\r
+</p>\r
+</dd>\r
+<dt>\r
+&lt;head&gt;&#8230;\r
+</dt>\r
+<dd>\r
+<p>\r
+        In addition to objects\r
+        reachable from any of our references, keep objects\r
+        reachable from listed &lt;head&gt;s.\r
 </p>\r
 </dd>\r
 </dl>\r
 </div>\r
+<h2>EXAMPLE</h2>\r
+<div class="sectionbody">\r
+<p>To prune objects not used by your repository nor another that\r
+borrows from your repository via its\r
+<tt>.git/objects/info/alternates</tt>:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git prune $(cd ../another &amp;&amp; $(git-rev-parse --all))</tt></pre>\r
+</div></div>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>\r
@@ -322,7 +340,7 @@ running <tt>git prune-packed</tt>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Jan-2007 08:57:03 UTC\r
+Last updated 22-Jan-2007 08:59:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-prune.txt b/git-prune.txt
index fbd344da4028b76bb6f2bbb1401fe836624d0403..a11e3030943ab3ffd10afa017640826795809d05 100644 (file)
--- 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] [--grace=<time>]
+'git-prune' [-n] [--] [<head>...]
 
 DESCRIPTION
 -----------
@@ -28,12 +28,6 @@ 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.
 
@@ -52,7 +46,6 @@ borrows from your repository via its
 ------------
 $ git prune $(cd ../another && $(git-rev-parse --all))
 ------------
-////////////////////////////////////////////
 
 Author
 ------

diff --git a/git.html b/git.html
index 6af03bef2773a59c9f424b5db046237275881a81..4c54ed56ec9cb200fe926a47b8969e18e885fd3f 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2285,7 +2285,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Jan-2007 08:57:05 UTC\r
+Last updated 22-Jan-2007 08:59:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial-2.html b/tutorial-2.html
index 5b4102f94ea61427fcfb6a4735e93f82e1e060e3..49a75b54163e7551f9850d5e1dcce8fb8962efc5 100644 (file)
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -592,8 +592,8 @@ $ git add closing.txt</tt></pre>
 current contents of the file:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git cat-file blob a6b11f7a\r
-goodbye, word</tt></pre>\r
+<pre><tt>$ git cat-file blob 8b9743b2\r
+goodbye, world</tt></pre>\r
 </div></div>\r
 <p>The "status" command is a useful way to get a quick summary of the\r
 situation:</p>\r
@@ -646,7 +646,7 @@ example, creating a new commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jan-2007 06:53:24 UTC\r
+Last updated 22-Jan-2007 08:59:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial-2.txt b/tutorial-2.txt
index f48894c9a25001374210fba3f6782ccec996a664..f363d17f0bedb8145f003ecef29832faf18a0730 100644 (file)
--- a/tutorial-2.txt
+++ b/tutorial-2.txt
@@ -343,8 +343,8 @@ And, as you can see with cat-file, this new entry refers to the
 current contents of the file:
 
 ------------------------------------------------
-$ git cat-file blob a6b11f7a
-goodbye, word
+$ git cat-file blob 8b9743b2
+goodbye, world
 ------------------------------------------------
 
 The "status" command is a useful way to get a quick summary of the