Autogenerated HTML docs for v1.5.4.4-537-gb75aa

diff --git a/config.txt b/config.txt
index c5e094a9c4a31568e4efb2c70af7e7808ae63528..bfad0e3858047aa4606e48120e16831e6f17c2f7 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -590,6 +590,10 @@ gc.packrefs::
        at some stage, and setting this to `false` will continue to
        prevent `git pack-refs` from being run from `git gc`.
 
+gc.pruneexpire::
+       When `git gc` is run, it will call `prune --expire 2.weeks.ago`.
+       Override the grace period with this config variable.
+
 gc.reflogexpire::
        `git reflog expire` removes reflog entries older than
        this time; defaults to 90 days.
@@ -860,7 +864,7 @@ pack.indexVersion::
        whenever the corresponding pack is larger than 2 GB.  Otherwise
        the default is 1.
 
-pack.packSizeLimit:
+pack.packSizeLimit::
        The default maximum size of a pack.  This setting only affects
        packing to a file, i.e. the git:// protocol is unaffected.  It
        can be overridden by the `\--max-pack-size` option of

diff --git a/git-config.html b/git-config.html
index 9be8b83cd1b8b66d16893c07d8ddcc2288767b33..5d91750112565520c08a268ea6b3a0b8d4dd35b9 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1566,6 +1566,15 @@ gc.packrefs
 </p>\r
 </dd>\r
 <dt>\r
+gc.pruneexpire\r
+</dt>\r
+<dd>\r
+<p>\r
+        When <tt>git gc</tt> is run, it will call <tt>prune --expire 2.weeks.ago</tt>.\r
+        Override the grace period with this config variable.\r
+</p>\r
+</dd>\r
+<dt>\r
 gc.reflogexpire\r
 </dt>\r
 <dd>\r
@@ -2076,13 +2085,17 @@ pack.indexVersion
         the default is 1.\r
 </p>\r
 </dd>\r
-</dl>\r
-<p>pack.packSizeLimit:\r
+<dt>\r
+pack.packSizeLimit\r
+</dt>\r
+<dd>\r
+<p>\r
         The default maximum size of a pack.  This setting only affects\r
         packing to a file, i.e. the git:// protocol is unaffected.  It\r
         can be overridden by the <tt>--max-pack-size</tt> option of\r
-        <a href="git-repack.html">git-repack(1)</a>.</p>\r
-<dl>\r
+        <a href="git-repack.html">git-repack(1)</a>.\r
+</p>\r
+</dd>\r
 <dt>\r
 pull.octopus\r
 </dt>\r
@@ -2360,7 +2373,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Mar-2008 09:29:57 UTC\r
+Last updated 13-Mar-2008 07:53:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-gc.html b/git-gc.html
index 2218816557f83d58f6de95f9fbe26dfa3e46ea5c..5814d4b1416d43883225b1993edd53fb929617cd 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> [--prune] [--aggressive] [--auto] [--quiet]</p>\r
+<p><em>git-gc</em> [--aggressive] [--auto] [--quiet]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -289,22 +289,6 @@ operating performance. Some git commands may automatically run
 <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
-<dt>\r
 --aggressive\r
 </dt>\r
 <dd>\r
@@ -380,6 +364,9 @@ the repository when the --aggressive option is specified.  The larger
 the value, the more time is spent optimizing the delta compression.  See\r
 the documentation for the --window' option in <a href="git-repack.html">git-repack(1)</a> for\r
 more details.  This defaults to 10.</p>\r
+<p>The optional configuration variable <em>gc.pruneExpire</em> controls how old\r
+the unreferenced loose objects have to be before they are pruned.  The\r
+default is "2 weeks ago".</p>\r
 </div>\r
 <h2>See Also</h2>\r
 <div class="sectionbody">\r
@@ -398,7 +385,7 @@ more details.  This defaults to 10.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Mar-2008 18:41:39 UTC\r
+Last updated 13-Mar-2008 07:53:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-gc.txt b/git-gc.txt
index 2e7be916aa5dede578b181e06457189551c16240..229a7c9b30482eb2d8729b581004bc776fa10edf 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' [--prune] [--aggressive] [--auto] [--quiet]
+'git-gc' [--aggressive] [--auto] [--quiet]
 
 DESCRIPTION
 -----------
@@ -25,17 +25,6 @@ operating performance. Some git commands may automatically run
 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).
-
 --aggressive::
        Usually 'git-gc' runs very quickly while providing good disk
        space utilization and performance.  This option will cause
@@ -104,6 +93,10 @@ the value, the more time is spent optimizing the delta compression.  See
 the documentation for the --window' option in linkgit:git-repack[1] for
 more details.  This defaults to 10.
 
+The optional configuration variable 'gc.pruneExpire' controls how old
+the unreferenced loose objects have to be before they are pruned.  The
+default is "2 weeks ago".
+
 See Also
 --------
 linkgit:git-prune[1]