Autogenerated HTML docs for v1.4.2.1-g83915

diff --git a/config.txt b/config.txt
index bb2fbc324e6fa93a639b31668a7a030ece7787f0..98c1f3e2e32e71047d6f0f6cf982e207117c64e2 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -119,6 +119,13 @@ apply.whitespace::
        Tells `git-apply` how to handle whitespaces, in the same way
        as the '--whitespace' option. See gitlink:git-apply[1].
 
+branch.<name>.remote::
+       When in branch <name>, it tells `git fetch` which remote to fetch.
+
+branch.<name>.merge::
+       When in branch <name>, it tells `git fetch` the default remote branch
+       to be merged.
+
 pager.color::
        A boolean to enable/disable colored output when the pager is in
        use (default is true).

diff --git a/git-daemon.html b/git-daemon.html
index 57ed3ccac92848d001201422cd1bb925556c6f71..d2ff3cabfbbef95f07a518a5a5e0fbf6844ed5c4 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -276,6 +276,7 @@ git-daemon(1) Manual Page
 <div class="content"><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\r
              [--timeout=n] [--init-timeout=n] [--strict-paths]\r
              [--base-path=path] [--user-path | --user-path=path]\r
+             [--interpolated-path=pathtemplate]\r
              [--enable=service] [--disable=service]\r
              [--allow-override=service] [--forbid-override=service]\r
              [--reuseaddr] [--detach] [--pid-file=file]\r
@@ -324,6 +325,17 @@ git repositories.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--interpolated-path=pathtemplate\r
+</dt>\r
+<dd>\r
+<p>\r
+        To support virtual hosting, an interpolated path template can be\r
+        used to dynamically construct alternate paths.  The template\r
+        supports %H for the target hostname as supplied by the client,\r
+        and %D for the absolute path of the named repository.\r
+</p>\r
+</dd>\r
+<dt>\r
 --export-all\r
 </dt>\r
 <dd>\r
@@ -491,6 +503,56 @@ upload-pack
 </dd>\r
 </dl>\r
 </div>\r
+<h2>EXAMPLES</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+git-daemon as inetd server\r
+</dt>\r
+<dd>\r
+<p>\r
+        To set up <tt>git-daemon</tt> as an inetd service that handles any\r
+        repository under the whitelisted set of directories, /pub/foo\r
+        and /pub/bar, place an entry like the following into\r
+        /etc/inetd all on one line:\r
+</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        git stream tcp nowait nobody  /usr/bin/git-daemon\r
+                git-daemon --inetd --verbose\r
+                --syslog --export-all\r
+                /pub/foo /pub/bar</tt></pre>\r
+</div></div>\r
+</dd>\r
+<dt>\r
+git-daemon as inetd server for virtual hosts\r
+</dt>\r
+<dd>\r
+<p>\r
+        To set up <tt>git-daemon</tt> as an inetd service that handles\r
+        repositories for different virtual hosts, <tt>www.example.com</tt>\r
+        and <tt>www.example.org</tt>, place an entry like the following into\r
+        <tt>/etc/inetd</tt> all on one line:\r
+</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        git stream tcp nowait nobody /usr/bin/git-daemon\r
+                git-daemon --inetd --verbose\r
+                --syslog --export-all\r
+                --interpolated-path=/pub/%H%D\r
+                /pub/www.example.org/software\r
+                /pub/www.example.com/software\r
+                /software</tt></pre>\r
+</div></div>\r
+<p>In this example, the root-level directory <tt>/pub</tt> will contain\r
+a subdirectory for each virtual host name supported.\r
+Further, both hosts advertise repositories simply as\r
+<tt>git://www.example.com/software/repo.git</tt>.  For pre-1.4.0\r
+clients, a symlink from <tt>/software</tt> into the appropriate\r
+default repository could be made as well.</p>\r
+</dd>\r
+</dl>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;, YOSHIFUJI Hideaki\r
@@ -506,7 +568,7 @@ upload-pack
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Sep-2006 11:44:00 UTC\r
+Last updated 25-Sep-2006 04:45:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.txt b/git-daemon.txt
index 741f2c69bdace527c57b644ed072ead4dcb46201..51d7c94d7df0c15a74855f5ef910def64045681e 100644 (file)
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
              [--timeout=n] [--init-timeout=n] [--strict-paths]
              [--base-path=path] [--user-path | --user-path=path]
+             [--interpolated-path=pathtemplate]
              [--enable=service] [--disable=service]
             [--allow-override=service] [--forbid-override=service]
              [--reuseaddr] [--detach] [--pid-file=file]
@@ -50,6 +51,12 @@ OPTIONS
        'git://example.com/hello.git', `git-daemon` will interpret the path
        as '/srv/git/hello.git'.
 
+--interpolated-path=pathtemplate::
+       To support virtual hosting, an interpolated path template can be
+       used to dynamically construct alternate paths.  The template
+       supports %H for the target hostname as supplied by the client,
+       and %D for the absolute path of the named repository.
+
 --export-all::
        Allow pulling from all directories that look like GIT repositories
        (have the 'objects' and 'refs' subdirectories), even if they
@@ -135,6 +142,46 @@ upload-pack::
        disable it by setting `daemon.uploadpack` configuration
        item to `false`.
 
+EXAMPLES
+--------
+git-daemon as inetd server::
+       To set up `git-daemon` as an inetd service that handles any
+       repository under the whitelisted set of directories, /pub/foo
+       and /pub/bar, place an entry like the following into
+       /etc/inetd all on one line:
++
+------------------------------------------------
+       git stream tcp nowait nobody  /usr/bin/git-daemon
+               git-daemon --inetd --verbose
+               --syslog --export-all
+               /pub/foo /pub/bar
+------------------------------------------------
+
+
+git-daemon as inetd server for virtual hosts::
+       To set up `git-daemon` as an inetd service that handles
+       repositories for different virtual hosts, `www.example.com`
+       and `www.example.org`, place an entry like the following into
+       `/etc/inetd` all on one line:
++
+------------------------------------------------
+       git stream tcp nowait nobody /usr/bin/git-daemon
+               git-daemon --inetd --verbose
+               --syslog --export-all
+               --interpolated-path=/pub/%H%D
+               /pub/www.example.org/software
+               /pub/www.example.com/software
+               /software
+------------------------------------------------
++
+In this example, the root-level directory `/pub` will contain
+a subdirectory for each virtual host name supported.
+Further, both hosts advertise repositories simply as
+`git://www.example.com/software/repo.git`.  For pre-1.4.0
+clients, a symlink from `/software` into the appropriate
+default repository could be made as well.
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki

diff --git a/git-repo-config.html b/git-repo-config.html
index 2cb8c4bee204e42502d8031079d8ec83a910fe39..210f8b74b2f065dfb3fb75fdcba6a82bf69f2d85 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -687,6 +687,23 @@ apply.whitespace
 </p>\r
 </dd>\r
 <dt>\r
+branch.&lt;name&gt;.remote\r
+</dt>\r
+<dd>\r
+<p>\r
+        When in branch &lt;name&gt;, it tells <tt>git fetch</tt> which remote to fetch.\r
+</p>\r
+</dd>\r
+<dt>\r
+branch.&lt;name&gt;.merge\r
+</dt>\r
+<dd>\r
+<p>\r
+        When in branch &lt;name&gt;, it tells <tt>git fetch</tt> the default remote branch\r
+        to be merged.\r
+</p>\r
+</dd>\r
+<dt>\r
 pager.color\r
 </dt>\r
 <dd>\r
@@ -1007,7 +1024,7 @@ receive.denyNonFastforwads
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Sep-2006 08:13:18 UTC\r
+Last updated 25-Sep-2006 04:45:34 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.html b/git-rev-list.html
index 80834c0398cb074f606ec17f1c0102ce68b2b5e4..c7304e87f717c49c52727d87b0448b45c0a34b49 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -284,6 +284,7 @@ git-rev-list(1) Manual Page
              [ --stdin ]\r
              [ --topo-order ]\r
              [ --parents ]\r
+             [ --(author|committer|grep)=<pattern> ]\r
              [ [--objects | --objects-edge] [ --unpacked ] ]\r
              [ --pretty | --header ]\r
              [ --bisect ]\r
@@ -454,6 +455,24 @@ limiting may be applied.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--author=<em>pattern</em>, --committer=<em>pattern</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Limit the commits output to ones with author/committer\r
+        header lines that match the specified pattern.\r
+</p>\r
+</dd>\r
+<dt>\r
+--grep=<em>pattern</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Limit the commits output to ones with log message that\r
+        matches the specified pattern.\r
+</p>\r
+</dd>\r
+<dt>\r
 --remove-empty\r
 </dt>\r
 <dd>\r
@@ -626,7 +645,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-Sep-2006 09:35:38 UTC\r
+Last updated 25-Sep-2006 04:45:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 28966adbbce60c2d3fa02f47bf0797bc29d32f60..00a95e249fe82f2eb3d53dcc541559dceb3e8709 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -20,6 +20,7 @@ SYNOPSIS
             [ \--stdin ]
             [ \--topo-order ]
             [ \--parents ]
+            [ \--(author|committer|grep)=<pattern> ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
@@ -154,6 +155,16 @@ limiting may be applied.
 
        Limit the commits output to specified time range.
 
+--author='pattern', --committer='pattern'::
+
+       Limit the commits output to ones with author/committer
+       header lines that match the specified pattern.
+
+--grep='pattern'::
+
+       Limit the commits output to ones with log message that
+       matches the specified pattern.
+
 --remove-empty::
 
        Stop when a given path disappears from the tree.

diff --git a/git-svn.html b/git-svn.html
index e237851e498a9a1939b8dd6640ef61e4cfa8a027..fd03854e53b11df3197cc747e2a1aa8e60bb92d7 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -580,6 +580,21 @@ enabled for them.</p>
 doing.</p>\r
 <p>repo-config key: svn.noignoreexternals</p>\r
 </dd>\r
+<dt>\r
+--ignore-nodate\r
+</dt>\r
+<dd>\r
+<p>\r
+Only used with the <em>fetch</em> command.\r
+</p>\r
+<p>By default git-svn will crash if it tries to import a revision\r
+from SVN which has <em>(no date)</em> listed as the date of the revision.\r
+This is repository corruption on SVN's part, plain and simple.\r
+But sometimes you really need those revisions anyway.</p>\r
+<p>If supplied git-svn will convert <em>(no date)</em> entries to the UNIX\r
+epoch (midnight on Jan. 1, 1970).  Yes, that's probably very wrong.\r
+SVN was very wrong.</p>\r
+</dd>\r
 </dl>\r
 <h3>Basic Examples</h3>\r
 <p>Tracking and contributing to an Subversion managed-project:</p>\r
@@ -714,7 +729,7 @@ detect them.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Aug-2006 08:43:07 UTC\r
+Last updated 25-Sep-2006 04:45:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.txt b/git-svn.txt
index b7b63f7136a01d6f3383346c292e5c8aceb8ced4..1cfa3e342cfdc074b0a9a113a59bcebee8869d07 100644 (file)
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -244,6 +244,18 @@ doing.
 
 repo-config key: svn.noignoreexternals
 
+--ignore-nodate::
+Only used with the 'fetch' command.
+
+By default git-svn will crash if it tries to import a revision
+from SVN which has '(no date)' listed as the date of the revision.
+This is repository corruption on SVN's part, plain and simple.
+But sometimes you really need those revisions anyway.
+
+If supplied git-svn will convert '(no date)' entries to the UNIX
+epoch (midnight on Jan. 1, 1970).  Yes, that's probably very wrong.
+SVN was very wrong.
+
 --
 
 Basic Examples

diff --git a/git-tar-tree.html b/git-tar-tree.html
index eebacd38d9b4581b17e1ee02d2e814d0c0be76c0..6b32fcd464cb7dae66bbea2c1538f9becffb74da 100644 (file)
--- a/git-tar-tree.html
+++ b/git-tar-tree.html
@@ -276,6 +276,8 @@ git-tar-tree(1) Manual Page
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
+<p>THIS COMMAND IS DEPRECATED.  Use <tt>git-archive</tt> with <tt>--format=tar</tt>\r
+option instead.</p>\r
 <p>Creates a tar archive containing the tree structure for the named tree.\r
 When &lt;base&gt; is specified it is added as a leading path to the files in the\r
 generated tar archive.</p>\r
@@ -393,7 +395,7 @@ git tar-tree HEAD:Documentation/ git-docs &gt; git-1.4.0-docs.tar
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 31-Jul-2006 08:45:02 UTC\r
+Last updated 25-Sep-2006 04:45:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tar-tree.txt b/git-tar-tree.txt
index 1e1c7fa856a2b80bb839da805aa57d43f65f968e..74a6fddd9a9f9d6831922fb163240c2a2c06994e 100644 (file)
--- a/git-tar-tree.txt
+++ b/git-tar-tree.txt
@@ -12,6 +12,9 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
+THIS COMMAND IS DEPRECATED.  Use `git-archive` with `--format=tar`
+option instead.
+
 Creates a tar archive containing the tree structure for the named tree.
 When <base> is specified it is added as a leading path to the files in the
 generated tar archive.

diff --git a/git-upload-tar.txt b/git-upload-tar.txt
deleted file mode 100644 (file)
index 394af62..0000000
--- a/git-upload-tar.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-git-upload-tar(1)
-=================
-
-NAME
-----
-git-upload-tar - Send tar archive
-
-
-SYNOPSIS
---------
-'git-upload-tar' <directory>
-
-DESCRIPTION
------------
-Invoked by 'git-tar-tree --remote' and sends a generated tar archive
-to the other end over the git protocol.
-
-This command is usually not invoked directly by the end user.
-The UI for the protocol is on the 'git-tar-tree' side, and the
-program pair is meant to be used to get a tar archive from a
-remote repository.
-
-
-OPTIONS
--------
-<directory>::
-       The repository to get a tar archive from.
-
-Author
-------
-Written by Junio C Hamano <junio@kernel.org>
-
-Documentation
---------------
-Documentation by Junio C Hamano.
-
-GIT
----
-Part of the gitlink:git[7] suite

diff --git a/git.html b/git.html
index 023fb273e8e185882a642c27f78a81d0a2ee341a..73ea3378b390170b1d71ce4e1a2ac67ed49c8dec 100644 (file)
--- a/git.html
+++ b/git.html
@@ -762,15 +762,6 @@ the working tree.</p>
         what are asked for.\r
 </p>\r
 </dd>\r
-<dt>\r
-<a href="git-upload-tar.html">git-upload-tar(1)</a>\r
-</dt>\r
-<dd>\r
-<p>\r
-        Invoked by <em>git-tar-tree --remote</em> to return the tar\r
-        archive the other end asked for.\r
-</p>\r
-</dd>\r
 </dl>\r
 </div>\r
 <h2>High-level commands (porcelain)</h2>\r
@@ -2173,7 +2164,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 04-Sep-2006 10:08:24 UTC\r
+Last updated 25-Sep-2006 04:45:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 744c38dee3c1835bb5e0ace4834547e6113e3bda..1bf5ef57e41eaa74836f75d089a07c3a40f2837e 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -247,10 +247,6 @@ gitlink:git-upload-pack[1]::
        Invoked by 'git-fetch-pack' to push
        what are asked for.
 
-gitlink:git-upload-tar[1]::
-       Invoked by 'git-tar-tree --remote' to return the tar
-       archive the other end asked for.
-
 
 High-level commands (porcelain)
 -------------------------------