Autogenerated HTML docs for v1.5.2-14-g45bde

diff --git a/config.txt b/config.txt
index ea434af9db1e864c4230b60886f1ca24237327e4..ee1c35e8eb952967980884d521d12a76622f38f4 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -204,23 +204,16 @@ core.warnAmbiguousRefs::
        and might match multiple refs in the .git/refs/ tree. True by default.
 
 core.compression::
+       An integer -1..9, indicating a default compression level.
+       -1 is the zlib default. 0 means no compression,
+       and 1..9 are various speed/size tradeoffs, 9 being slowest.
+
+core.loosecompression::
        An integer -1..9, indicating the compression level for objects that
-       are not in a pack file. -1 is the zlib and git default. 0 means no
+       are not in a pack file. -1 is the zlib default. 0 means no
        compression, and 1..9 are various speed/size tradeoffs, 9 being
-       slowest.
-
-core.legacyheaders::
-       A boolean which
-       changes the format of loose objects so that they are more
-       efficient to pack and to send out of the repository over git
-       native protocol, since v1.4.2.  However, loose objects
-       written in the new format cannot be read by git older than
-       that version; people fetching from your repository using
-       older versions of git over dumb transports (e.g. http)
-       will also be affected.
-+
-To let git use the new loose object format, you have to
-set core.legacyheaders to false.
+       slowest.  If not set,  defaults to core.compression.  If that is
+       not set,  defaults to 0 (best speed).
 
 core.packedGitWindowSize::
        Number of bytes of a pack file to map into memory in a
@@ -384,6 +377,11 @@ format.suffix::
        `.patch`. Use this variable to change that suffix (make sure to
        include the dot if you want it).
 
+gc.aggressiveWindow::
+       The window size parameter used in the delta compression
+       algorithm used by 'git gc --aggressive'.  This defaults
+       to 10.
+
 gc.packrefs::
        `git gc` does not run `git pack-refs` in a bare repository by
        default so that older dumb-transport clients can still fetch
@@ -550,6 +548,13 @@ pack.depth::
        The maximum delta depth used by gitlink:git-pack-objects[1] when no
        maximum depth is given on the command line. Defaults to 50.
 
+pack.compression::
+       An integer -1..9, indicating the compression level for objects
+       in a pack file. -1 is the zlib default. 0 means no
+       compression, and 1..9 are various speed/size tradeoffs, 9 being
+       slowest.  If not set,  defaults to core.compression.  If that is
+       not set,  defaults to -1.
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.

diff --git a/git-config.html b/git-config.html
index 9251753c08028c3219d85a80912083faec6a03f5..58f0ed34fb8617374d72a8d3e792d65c1619fdbb 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -834,28 +834,22 @@ core.compression
 </dt>\r
 <dd>\r
 <p>\r
-        An integer -1..9, indicating the compression level for objects that\r
-        are not in a pack file. -1 is the zlib and git default. 0 means no\r
-        compression, and 1..9 are various speed/size tradeoffs, 9 being\r
-        slowest.\r
+        An integer -1..9, indicating a default compression level.\r
+        -1 is the zlib default. 0 means no compression,\r
+        and 1..9 are various speed/size tradeoffs, 9 being slowest.\r
 </p>\r
 </dd>\r
 <dt>\r
-core.legacyheaders\r
+core.loosecompression\r
 </dt>\r
 <dd>\r
 <p>\r
-        A boolean which\r
-        changes the format of loose objects so that they are more\r
-        efficient to pack and to send out of the repository over git\r
-        native protocol, since v1.4.2.  However, loose objects\r
-        written in the new format cannot be read by git older than\r
-        that version; people fetching from your repository using\r
-        older versions of git over dumb transports (e.g. http)\r
-        will also be affected.\r
+        An integer -1..9, indicating the compression level for objects that\r
+        are not in a pack file. -1 is the zlib default. 0 means no\r
+        compression, and 1..9 are various speed/size tradeoffs, 9 being\r
+        slowest.  If not set,  defaults to core.compression.  If that is\r
+        not set,  defaults to 0 (best speed).\r
 </p>\r
-<p>To let git use the new loose object format, you have to\r
-set core.legacyheaders to false.</p>\r
 </dd>\r
 <dt>\r
 core.packedGitWindowSize\r
@@ -1115,6 +1109,16 @@ format.suffix
 </p>\r
 </dd>\r
 <dt>\r
+gc.aggressiveWindow\r
+</dt>\r
+<dd>\r
+<p>\r
+        The window size parameter used in the delta compression\r
+        algorithm used by <em>git gc --aggressive</em>.  This defaults\r
+        to 10.\r
+</p>\r
+</dd>\r
+<dt>\r
 gc.packrefs\r
 </dt>\r
 <dd>\r
@@ -1432,6 +1436,18 @@ pack.depth
 </p>\r
 </dd>\r
 <dt>\r
+pack.compression\r
+</dt>\r
+<dd>\r
+<p>\r
+        An integer -1..9, indicating the compression level for objects\r
+        in a pack file. -1 is the zlib default. 0 means no\r
+        compression, and 1..9 are various speed/size tradeoffs, 9 being\r
+        slowest.  If not set,  defaults to core.compression.  If that is\r
+        not set,  defaults to -1.\r
+</p>\r
+</dd>\r
+<dt>\r
 pull.octopus\r
 </dt>\r
 <dd>\r
@@ -1663,7 +1679,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-May-2007 07:15:31 UTC\r
+Last updated 20-May-2007 19:11:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-gc.html b/git-gc.html
index 687a283db7ad9da00be018843b3eb1cd3c92a297..541cdaab65ca99b95b97332595842bd38fa911e5 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]</p>\r
+<p><em>git-gc</em> [--prune] [--aggressive]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -303,6 +303,19 @@ operating performance.</p>
         in a cron script).\r
 </p>\r
 </dd>\r
+<dt>\r
+--aggressive\r
+</dt>\r
+<dd>\r
+<p>\r
+        Usually <em>git-gc</em> runs very quickly while providing good disk\r
+        space utilization and performance.   This option will cause\r
+        git-gc to more aggressive optimize the repository at the expense\r
+        of taking much more time.  The effects of this optimization are\r
+        persistent, so this option only needs to be sporadically; every\r
+        few hundred changesets or so.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Configuration</h2>\r
@@ -330,6 +343,12 @@ kept.  This defaults to 15 days.</p>
 <tt>git gc</tt> runs <tt>git-pack-refs</tt>.  Without the configuration, <tt>git-pack-refs</tt>\r
 is not run in bare repositories by default, to allow older dumb-transport\r
 clients fetch from the repository,  but this will change in the future.</p>\r
+<p>The optional configuration variable <em>gc.aggressiveWindow</em> controls how\r
+much time is spent optimizing the delta compression of the objects in\r
+the repository when the --aggressive option is specified.  The larger\r
+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
 </div>\r
 <h2>See Also</h2>\r
 <div class="sectionbody">\r
@@ -348,7 +367,7 @@ clients fetch from the repository,  but this will change in the future.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:44 UTC\r
+Last updated 20-May-2007 19:11:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-gc.txt b/git-gc.txt
index bc1658434a61bdba41699859f103a3c8e0802d95..4ac839f938f9c2617c211dd829ba910577534558 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]
+'git-gc' [--prune] [--aggressive]
 
 DESCRIPTION
 -----------
@@ -35,6 +35,13 @@ OPTIONS
        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
+       git-gc to more aggressive optimize the repository at the expense
+       of taking much more time.  The effects of this optimization are
+       persistent, so this option only needs to be sporadically; every
+       few hundred changesets or so.
 
 Configuration
 -------------
@@ -67,6 +74,13 @@ The optional configuration variable 'gc.packrefs' determines if
 is not run in bare repositories by default, to allow older dumb-transport
 clients fetch from the repository,  but this will change in the future.
 
+The optional configuration variable 'gc.aggressiveWindow' controls how
+much time is spent optimizing the delta compression of the objects in
+the repository when the --aggressive option is specified.  The larger
+the value, the more time is spent optimizing the delta compression.  See
+the documentation for the --window' option in gitlink:git-repack[1] for
+more details.  This defaults to 10.
+
 See Also
 --------
 gitlink:git-prune[1]

diff --git a/git-pack-objects.html b/git-pack-objects.html
index 43b081f9ecc14696ee5213a9fff07b3e7fb45d68..6af52ff9a514149a40f1a3e1b0944c5b67af5cbc 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -452,6 +452,35 @@ base-name
 </p>\r
 </dd>\r
 <dt>\r
+--no-reuse-object\r
+</dt>\r
+<dd>\r
+<p>\r
+        This flag tells the command not to reuse existing object data at all,\r
+        including non deltified object, forcing recompression of everything.\r
+        This implies --no-reuse-delta. Useful only in the obscure case where\r
+        wholesale enforcement of a different compression level on the\r
+        packed data is desired.\r
+</p>\r
+</dd>\r
+<dt>\r
+--compression=[N]\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specifies compression level for newly-compressed data in the\r
+        generated pack.  If not specified,  pack compression level is\r
+        determined first by pack.compression,  then by core.compression,\r
+        and defaults to -1,  the zlib default,  if neither is set.\r
+        Data copied from loose objects will be recompressed\r
+        if core.legacyheaders was true when they were created or if\r
+        the loose compression level (see core.loosecompression and\r
+        core.compression) is now a different value than the pack\r
+        compression level.  Add --no-reuse-object if you want to force\r
+        a uniform compression level on all data no matter the source.\r
+</p>\r
+</dd>\r
+<dt>\r
 --delta-base-offset\r
 </dt>\r
 <dd>\r
@@ -499,7 +528,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-May-2007 07:15:31 UTC\r
+Last updated 20-May-2007 19:11:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index bd3ee456e336add5d880d6a1192646220e7c34d7..2531238df45a39ad6a60ae8d489cdac871ad45b3 100644 (file)
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -127,6 +127,25 @@ base-name::
        This flag tells the command not to reuse existing deltas
        but compute them from scratch.
 
+--no-reuse-object::
+       This flag tells the command not to reuse existing object data at all,
+       including non deltified object, forcing recompression of everything.
+       This implies --no-reuse-delta. Useful only in the obscure case where
+       wholesale enforcement of a different compression level on the
+       packed data is desired.
+
+--compression=[N]::
+       Specifies compression level for newly-compressed data in the
+       generated pack.  If not specified,  pack compression level is
+       determined first by pack.compression,  then by core.compression,
+       and defaults to -1,  the zlib default,  if neither is set.
+       Data copied from loose objects will be recompressed
+       if core.legacyheaders was true when they were created or if
+       the loose compression level (see core.loosecompression and
+       core.compression) is now a different value than the pack
+       compression level.  Add --no-reuse-object if you want to force
+       a uniform compression level on all data no matter the source.
+
 --delta-base-offset::
        A packed archive can express base object of a delta as
        either 20-byte object name or as an offset in the

diff --git a/git-update-ref.html b/git-update-ref.html
index 068eb7dfd30f7ac07a84cb885bb8f3aa328e8111..046d819fc2f1d12faa287c039f90ca0b31816640 100644 (file)
--- a/git-update-ref.html
+++ b/git-update-ref.html
@@ -272,7 +272,7 @@ git-update-ref(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-update-ref</em> [-m &lt;reason&gt;] (-d &lt;ref&gt; &lt;oldvalue&gt; | &lt;ref&gt; &lt;newvalue&gt; [&lt;oldvalue&gt;])</p>\r
+<p><em>git-update-ref</em> [-m &lt;reason&gt;] (-d &lt;ref&gt; &lt;oldvalue&gt; | [--no-deref] &lt;ref&gt; &lt;newvalue&gt; [&lt;oldvalue&gt;])</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -297,6 +297,8 @@ if they start with "refs/": otherwise it will just try to read
 them and update them as a regular file (i.e. it will allow the\r
 filesystem to follow them, but will overwrite such a symlink to\r
 somewhere else with a regular filename).</p>\r
+<p>If --no-deref is given, &lt;ref&gt; itself is overwritten, rather than\r
+the result of following the symbolic pointers.</p>\r
 <p>In general, using</p>\r
 <div class="literalblock">\r
 <div class="content">\r
@@ -358,7 +360,7 @@ or does not have committer information available.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:32 UTC\r
+Last updated 20-May-2007 19:11:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-ref.txt b/git-update-ref.txt
index 9424feab320afcaa5a44bd2c2c6c86728bd8d004..f222616591f157beada3c5355ee0e56d68171761 100644 (file)
--- a/git-update-ref.txt
+++ b/git-update-ref.txt
@@ -7,7 +7,7 @@ git-update-ref - Update the object name stored in a ref safely
 
 SYNOPSIS
 --------
-'git-update-ref' [-m <reason>] (-d <ref> <oldvalue> | <ref> <newvalue> [<oldvalue>])
+'git-update-ref' [-m <reason>] (-d <ref> <oldvalue> | [--no-deref] <ref> <newvalue> [<oldvalue>])
 
 DESCRIPTION
 -----------
@@ -36,6 +36,9 @@ them and update them as a regular file (i.e. it will allow the
 filesystem to follow them, but will overwrite such a symlink to
 somewhere else with a regular filename).
 
+If --no-deref is given, <ref> itself is overwritten, rather than
+the result of following the symbolic pointers.
+
 In general, using
 
        git-update-ref HEAD "$head"