Autogenerated HTML docs for v1.5.4.1-34-g94bf

diff --git a/blame-options.txt b/blame-options.txt
index ea1007bfb0e759a7b3704c8d44270023cb78dc6b..c11bb7d36c39899d782f8c2d3f87b5a59178840a 100644 (file)
--- a/blame-options.txt
+++ b/blame-options.txt
@@ -52,7 +52,7 @@ of lines before or after the line given by <start>.
        When <rev> is not specified, the command annotates the
        changes starting backwards from the working tree copy.
        This flag makes the command pretend as if the working
-       tree copy has the contents of he named file (specify
+       tree copy has the contents of the named file (specify
        `-` to make the command read from the standard input).
 
 -M|<num>|::

diff --git a/config.txt b/config.txt
index 4e222f15a5b2b84eb5d55bc79c605510bd89b7b6..3e10feb9fbbf44c634c32f30dd23a4534535190d 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -766,6 +766,12 @@ pack.indexVersion::
        whenever the corresponding pack is larger than 2 GB.  Otherwise
        the default is 1.
 
+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
+       linkgit:git-repack[1].
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.

diff --git a/git-annotate.html b/git-annotate.html
index 9ba9422141954878322da025e36c697cbbeedbde..fdb1b2491abb4fb5c4d006fe1a8b0c6ab9852d64 100644 (file)
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -390,7 +390,7 @@ of lines before or after the line given by &lt;start&gt;.</p>
         When &lt;rev&gt; is not specified, the command annotates the\r
         changes starting backwards from the working tree copy.\r
         This flag makes the command pretend as if the working\r
-        tree copy has the contents of he named file (specify\r
+        tree copy has the contents of the named file (specify\r
         <tt>-</tt> to make the command read from the standard input).\r
 </p>\r
 </dd>\r
@@ -454,7 +454,7 @@ commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:01 UTC\r
+Last updated 10-Feb-2008 10:47:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-blame.html b/git-blame.html
index 99ad263b40a2fb6a17a1a987ef21b73623035103..64b7fe0d3923fc44c0084d65960d141606214a8b 100644 (file)
--- a/git-blame.html
+++ b/git-blame.html
@@ -408,7 +408,7 @@ of lines before or after the line given by &lt;start&gt;.</p>
         When &lt;rev&gt; is not specified, the command annotates the\r
         changes starting backwards from the working tree copy.\r
         This flag makes the command pretend as if the working\r
-        tree copy has the contents of he named file (specify\r
+        tree copy has the contents of the named file (specify\r
         <tt>-</tt> to make the command read from the standard input).\r
 </p>\r
 </dd>\r
@@ -686,7 +686,7 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:02 UTC\r
+Last updated 10-Feb-2008 10:47:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.html b/git-config.html
index 8d29af9f76abadd3113d0ef8b606d4a00689a5a7..a928861359667350e248b65bc82c2f0a1542aa81 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1952,6 +1952,13 @@ pack.indexVersion
         the default is 1.\r
 </p>\r
 </dd>\r
+</dl>\r
+<p>pack.packSizeLimit:\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
 <dt>\r
 pull.octopus\r
 </dt>\r
@@ -2213,7 +2220,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 30-Jan-2008 08:28:22 UTC\r
+Last updated 10-Feb-2008 10:47:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.html b/git-pack-objects.html
index b2f730954ad5aa0e6367c54ad326ca2cae4e3b76..7d552499c87ff4b6646ee5781026e2067731363f 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -397,7 +397,8 @@ base-name
 <p>\r
         Maximum size of each output packfile, expressed in MiB.\r
         If specified,  multiple packfiles may be created.\r
-        The default is unlimited.\r
+        The default is unlimited, unless the config variable\r
+        <tt>pack.packSizeLimit</tt> is set.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -563,7 +564,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:35 UTC\r
+Last updated 10-Feb-2008 10:47:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index 74cc7c1cb831c700c14406f6e306e7a3002054d2..8353be186fcc83092acac16b4fc164d6ea669621 100644 (file)
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -99,7 +99,8 @@ base-name::
 --max-pack-size=<n>::
        Maximum size of each output packfile, expressed in MiB.
        If specified,  multiple packfiles may be created.
-       The default is unlimited.
+       The default is unlimited, unless the config variable
+       `pack.packSizeLimit` is set.
 
 --incremental::
        This flag causes an object already in a pack ignored