Autogenerated HTML docs for v1.5.3.1-91-gd3392

diff --git a/config.txt b/config.txt
index 866e0534b8843af3c1789becd06b244162632d01..015910f27a450cdaec80f3bfc2679243126736c0 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -630,9 +630,17 @@ pack.deltaCacheSize::
        A value of 0 means no limit. Defaults to 0.
 
 pack.deltaCacheLimit::
-       The maxium size of a delta, that is cached in
+       The maximum size of a delta, that is cached in
        gitlink:git-pack-objects[1]. Defaults to 1000.
 
+pack.threads::
+       Specifies the number of threads to spawn when searching for best
+       delta matches.  This requires that gitlink:git-pack-objects[1]
+       be compiled with pthreads otherwise this option is ignored with a
+       warning. This is meant to reduce packing time on multiprocessor
+       machines. The required amount of memory for the delta search window
+       is however multiplied by the number of threads.
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.

diff --git a/git-archive.html b/git-archive.html
index 402de7cee0ae1705c64d9121e03aa7586497409d..5948cc6789e2aae96e543855c1244ae6c49c3f4e 100644 (file)
--- a/git-archive.html
+++ b/git-archive.html
@@ -279,7 +279,8 @@ git-archive(1) Manual Page
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 <p>Creates an archive of the specified format containing the tree\r
-structure for the named tree.  If &lt;prefix&gt; is specified it is\r
+structure for the named tree, and writes it out to the standard\r
+output.  If &lt;prefix&gt; is specified it is\r
 prepended to the filenames in the archive.</p>\r
 <p><em>git-archive</em> behaves differently when given a tree ID versus when\r
 given a commit ID or tag ID.  In the first case the current time is\r
@@ -298,7 +299,7 @@ comment.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Format of the resulting archive: <em>tar</em>, <em>zip</em>&#8230;  The default\r
+        Format of the resulting archive: <em>tar</em> or <em>zip</em>.  The default\r
         is <em>tar</em>.\r
 </p>\r
 </dd>\r
@@ -458,7 +459,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ &gt; git-1.4.0-d
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Aug-2007 00:24:02 UTC\r
+Last updated 15-Sep-2007 07:45:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-archive.txt b/git-archive.txt
index f2080eb6ad35282107fd5500eb9cba9290497cb9..e1e2d60fef1b8fc85e30243f403bd11d80ca980b 100644 (file)
--- a/git-archive.txt
+++ b/git-archive.txt
@@ -15,7 +15,8 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Creates an archive of the specified format containing the tree
-structure for the named tree.  If <prefix> is specified it is
+structure for the named tree, and writes it out to the standard
+output.  If <prefix> is specified it is
 prepended to the filenames in the archive.
 
 'git-archive' behaves differently when given a tree ID versus when
@@ -31,7 +32,7 @@ OPTIONS
 -------
 
 --format=<fmt>::
-       Format of the resulting archive: 'tar', 'zip'...  The default
+       Format of the resulting archive: 'tar' or 'zip'.  The default
        is 'tar'.
 
 --list, -l::

diff --git a/git-config.html b/git-config.html
index 7ec3b96d36951bcca6f6fda4a7d8dcbe77dd7314..5f353cb0aab4253655b7574f7cc8e66fa5cde19a 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -504,15 +504,18 @@ rather than from all available files.</p>
 <div class="sectionbody">\r
 <p>If not set explicitly with <em>--file</em>, there are three files where\r
 git-config will search for configuration options:</p>\r
-<div class="literalblock">\r
-<div class="title">git/config::</div>\r
-<div class="content">\r
-<pre><tt>Repository specific configuration file. (The filename is\r
-of course relative to the repository root, not the working\r
-directory.)</tt></pre>\r
-</div></div>\r
 <dl>\r
 <dt>\r
+$GIT_DIR/config\r
+</dt>\r
+<dd>\r
+<p>\r
+        Repository specific configuration file. (The filename is\r
+        of course relative to the repository root, not the working\r
+        directory.)\r
+</p>\r
+</dd>\r
+<dt>\r
 ~/.gitconfig\r
 </dt>\r
 <dd>\r
@@ -1659,11 +1662,24 @@ pack.deltaCacheLimit
 </dt>\r
 <dd>\r
 <p>\r
-        The maxium size of a delta, that is cached in\r
+        The maximum size of a delta, that is cached in\r
         <a href="git-pack-objects.html">git-pack-objects(1)</a>. Defaults to 1000.\r
 </p>\r
 </dd>\r
 <dt>\r
+pack.threads\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specifies the number of threads to spawn when searching for best\r
+        delta matches.  This requires that <a href="git-pack-objects.html">git-pack-objects(1)</a>\r
+        be compiled with pthreads otherwise this option is ignored with a\r
+        warning. This is meant to reduce packing time on multiprocessor\r
+        machines. The required amount of memory for the delta search window\r
+        is however multiplied by the number of threads.\r
+</p>\r
+</dd>\r
+<dt>\r
 pull.octopus\r
 </dt>\r
 <dd>\r
@@ -1891,7 +1907,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Sep-2007 11:16:23 UTC\r
+Last updated 15-Sep-2007 07:45:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.txt b/git-config.txt
index 5b794f439990e3ddeb80adee31de44063ef44ee6..a592b61e2fe998525d0978547b3ea7e4ad2d72ac 100644 (file)
--- a/git-config.txt
+++ b/git-config.txt
@@ -142,7 +142,7 @@ FILES
 If not set explicitly with '--file', there are three files where
 git-config will search for configuration options:
 
-.git/config::
+$GIT_DIR/config::
        Repository specific configuration file. (The filename is
        of course relative to the repository root, not the working
        directory.)

diff --git a/git-ls-files.html b/git-ls-files.html
index 7bb361d2144ecad5e0fb67c58dd679bd212b9c49..bb04e01ef4f629e2475c96e94696989c78543708 100644 (file)
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -279,7 +279,7 @@ git-ls-files(1) Manual Page
                 [-x <pattern>|--exclude=<pattern>]\r
                 [-X <file>|--exclude-from=<file>]\r
                 [--exclude-per-directory=<file>]\r
-                [--error-unmatch]\r
+                [--error-unmatch] [--with-tree=<tree-ish>]\r
                 [--full-name] [--abbrev] [--] [&lt;file&gt;]*</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -421,6 +421,18 @@ shown:</p>
 </p>\r
 </dd>\r
 <dt>\r
+--with-tree=&lt;tree-ish&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        When using --error-unmatch to expand the user supplied\r
+        &lt;file&gt; (i.e. path pattern) arguments to paths, pretend\r
+        that paths which were removed in the index since the\r
+        named &lt;tree-ish&gt; are still present.  Using this option\r
+        with <tt>-s</tt> or <tt>-u</tt> options does not make any sense.\r
+</p>\r
+</dd>\r
+<dt>\r
 -t\r
 </dt>\r
 <dd>\r
@@ -603,7 +615,7 @@ pattern file appears in.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:45 UTC\r
+Last updated 15-Sep-2007 07:45:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-files.txt b/git-ls-files.txt
index 997594549fbf5a1e50a7d187c3cebcbe93461455..9e454f0a4da465606afbed1720b7bd10cca8b241 100644 (file)
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -15,7 +15,7 @@ SYNOPSIS
                [-x <pattern>|--exclude=<pattern>]
                [-X <file>|--exclude-from=<file>]
                [--exclude-per-directory=<file>]
-               [--error-unmatch]
+               [--error-unmatch] [--with-tree=<tree-ish>]
                [--full-name] [--abbrev] [--] [<file>]\*
 
 DESCRIPTION
@@ -81,6 +81,13 @@ OPTIONS
        If any <file> does not appear in the index, treat this as an
        error (return 1).
 
+--with-tree=<tree-ish>::
+       When using --error-unmatch to expand the user supplied
+       <file> (i.e. path pattern) arguments to paths, pretend
+       that paths which were removed in the index since the
+       named <tree-ish> are still present.  Using this option
+       with `-s` or `-u` options does not make any sense.
+
 -t::
        Identify the file status with the following tags (followed by
        a space) at the start of each line:

diff --git a/git-pack-objects.html b/git-pack-objects.html
index 7a41e28545fa212563843cfa38c237288d2612ee..ed4a2ee1bb8bc6371b47d9ee67945ce158682e1e 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -519,6 +519,19 @@ base-name
 </p>\r
 </dd>\r
 <dt>\r
+--threads=&lt;n&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specifies the number of threads to spawn when searching for best\r
+        delta matches.  This requires that pack-objects be compiled with\r
+        pthreads otherwise this option is ignored with a warning.\r
+        This is meant to reduce packing time on multiprocessor machines.\r
+        The required amount of memory for the delta search window is\r
+        however multiplied by the number of threads.\r
+</p>\r
+</dd>\r
+<dt>\r
 --index-version=&lt;version&gt;[,&lt;offset&gt;]\r
 </dt>\r
 <dd>\r
@@ -550,7 +563,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Sep-2007 08:10:46 UTC\r
+Last updated 15-Sep-2007 07:45:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index f8a0be351188f39e94c9ffa4dc9a1fcea367e290..628f296ce1366f728d9a2321bd02e3db492adffb 100644 (file)
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -169,6 +169,14 @@ base-name::
        length, this option typically shrinks the resulting
        packfile by 3-5 per-cent.
 
+--threads=<n>::
+       Specifies the number of threads to spawn when searching for best
+       delta matches.  This requires that pack-objects be compiled with
+       pthreads otherwise this option is ignored with a warning.
+       This is meant to reduce packing time on multiprocessor machines.
+       The required amount of memory for the delta search window is
+       however multiplied by the number of threads.
+
 --index-version=<version>[,<offset>]::
        This is intended to be used by the test suite only. It allows
        to force the version for the generated pack index, and to force

diff --git a/git-remote.html b/git-remote.html
index 6b26c16aafa93a39a6973b15be0c84454d39216d..4aab497aa5720ed949d83c9f3e62398b6b21ca84 100644 (file)
--- a/git-remote.html
+++ b/git-remote.html
@@ -274,7 +274,7 @@ git-remote(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-remote</em>\r
-<em>git-remote</em> add [-t &lt;branch&gt;] [-m &lt;branch&gt;] [-f] &lt;name&gt; &lt;url&gt;\r
+<em>git-remote</em> add [-t &lt;branch&gt;] [-m &lt;branch&gt;] [-f] [--mirror] &lt;name&gt; &lt;url&gt;\r
 <em>git-remote</em> show &lt;name&gt;\r
 <em>git-remote</em> prune &lt;name&gt;\r
 <em>git-remote</em> update [group]</div></div>\r
@@ -307,6 +307,9 @@ multiple branches without grabbing all branches.</p>
 <p>With <tt>-m &lt;master&gt;</tt> option, <tt>$GIT_DIR/remotes/&lt;name&gt;/HEAD</tt> is set\r
 up to point at remote's <tt>&lt;master&gt;</tt> branch instead of whatever\r
 branch the <tt>HEAD</tt> at the remote repository actually points at.</p>\r
+<p>In mirror mode, enabled with <tt>--mirror</tt>, the refs will not be stored\r
+in the <em>refs/remotes/</em> namespace, but in <em>refs/heads/</em>.  This option\r
+only makes sense in bare repositories.</p>\r
 </dd>\r
 <dt>\r
 <em>show</em>\r
@@ -415,7 +418,7 @@ $ git merge origin</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:51 UTC\r
+Last updated 15-Sep-2007 07:45:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-remote.txt b/git-remote.txt
index 61a6022ce8a0fc7aac8b1e9bd08587817ef0d69c..94b9f177724993b800e5d0bd4e67f986bfffc188 100644 (file)
--- a/git-remote.txt
+++ b/git-remote.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-remote'
-'git-remote' add [-t <branch>] [-m <branch>] [-f] <name> <url>
+'git-remote' add [-t <branch>] [-m <branch>] [-f] [--mirror] <name> <url>
 'git-remote' show <name>
 'git-remote' prune <name>
 'git-remote' update [group]
@@ -45,6 +45,10 @@ multiple branches without grabbing all branches.
 With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set
 up to point at remote's `<master>` branch instead of whatever
 branch the `HEAD` at the remote repository actually points at.
++
+In mirror mode, enabled with `--mirror`, the refs will not be stored
+in the 'refs/remotes/' namespace, but in 'refs/heads/'.  This option
+only makes sense in bare repositories.
 
 'show'::