Autogenerated HTML docs for v1.5.4-rc0-67-gf9c5

diff --git a/config.txt b/config.txt
index ce16fc79ebd3ecd2598708363d7567135d0b390d..8a0df5736e6025b2fffc21f3bd24588c8e78b0e5 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -448,6 +448,13 @@ diff.autorefreshindex::
        affects only `git diff` Porcelain, and not lower level
        `diff` commands, such as `git diff-files`.
 
+diff.external::
+       If this config variable is set, diff generation is not
+       performed using the internal diff machinery, but using the
+       given command.  Note: if you want to use an external diff
+       program only on a subset of your files, you might want to
+       use gitlink:gitattributes[5] instead.
+
 diff.renameLimit::
        The number of files to consider when performing the copy/rename
        detection; equivalent to the git diff option '-l'.
@@ -671,6 +678,10 @@ merge.<driver>.recursive::
        performing an internal merge between common ancestors.
        See gitlink:gitattributes[5] for details.
 
+mergetool.<tool>.path::
+       Override the path for the given tool.  This is useful in case
+       your tool is not in the PATH.
+
 pack.window::
        The size of the window used by gitlink:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.

diff --git a/git-config.html b/git-config.html
index f7c9cf8af6928c3608c0b253018e04dc2570bf29..e0d81feea585d1f98fba2305ce22fa6116ccfef5 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1349,6 +1349,18 @@ diff.autorefreshindex
 </p>\r
 </dd>\r
 <dt>\r
+diff.external\r
+</dt>\r
+<dd>\r
+<p>\r
+        If this config variable is set, diff generation is not\r
+        performed using the internal diff machinery, but using the\r
+        given command.  Note: if you want to use an external diff\r
+        program only on a subset of your files, you might want to\r
+        use <a href="gitattributes.html">gitattributes(5)</a> instead.\r
+</p>\r
+</dd>\r
+<dt>\r
 diff.renameLimit\r
 </dt>\r
 <dd>\r
@@ -1768,6 +1780,15 @@ merge.&lt;driver&gt;.recursive
 </p>\r
 </dd>\r
 <dt>\r
+mergetool.&lt;tool&gt;.path\r
+</dt>\r
+<dd>\r
+<p>\r
+        Override the path for the given tool.  This is useful in case\r
+        your tool is not in the PATH.\r
+</p>\r
+</dd>\r
+<dt>\r
 pack.window\r
 </dt>\r
 <dd>\r
@@ -2105,7 +2126,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2007 22:13:21 UTC\r
+Last updated 18-Dec-2007 06:59:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.html b/git-daemon.html
index fb794a45a626c85f6cc7e6d3bf50c487e827895c..0df3b32ec7daebcbe4a2f89722f8b29c4afc035f 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -294,8 +294,8 @@ for export this way (unless the <em>--export-all</em> parameter is specified). I
 pass some directory paths as <em>git-daemon</em> arguments, you can further restrict\r
 the offers to a whitelist comprising of those.</p>\r
 <p>By default, only <tt>upload-pack</tt> service is enabled, which serves\r
-<tt>git-fetch-pack</tt> and <tt>git-peek-remote</tt> clients that are invoked\r
-from <tt>git-fetch</tt>, <tt>git-ls-remote</tt>, and <tt>git-clone</tt>.</p>\r
+<tt>git-fetch-pack</tt> and <tt>git-ls-remote</tt> clients, which are invoked\r
+from <tt>git-fetch</tt>, <tt>git-pull</tt>, and <tt>git-clone</tt>.</p>\r
 <p>This is ideally suited for read-only updates, i.e., pulling from\r
 git repositories.</p>\r
 <p>An <tt>upload-archive</tt> also exists to serve <tt>git-archive</tt>.</p>\r
@@ -532,7 +532,7 @@ upload-pack
 </dt>\r
 <dd>\r
 <p>\r
-        This serves <tt>git-fetch-pack</tt> and <tt>git-peek-remote</tt>\r
+        This serves <tt>git-fetch-pack</tt> and <tt>git-ls-remote</tt>\r
         clients.  It is enabled by default, but a repository can\r
         disable it by setting <tt>daemon.uploadpack</tt> configuration\r
         item to <tt>false</tt>.\r
@@ -676,7 +676,7 @@ selectively enable/disable services per repository
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:27 UTC\r
+Last updated 18-Dec-2007 06:59:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.txt b/git-daemon.txt
index 99e47c9c257d7bb1de78729460069b5c4ebc47dd..f1e48dd0217c9506cbfb74343164d05473806bf3 100644 (file)
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -31,8 +31,8 @@ pass some directory paths as 'git-daemon' arguments, you can further restrict
 the offers to a whitelist comprising of those.
 
 By default, only `upload-pack` service is enabled, which serves
-`git-fetch-pack` and `git-peek-remote` clients that are invoked
-from `git-fetch`, `git-ls-remote`, and `git-clone`.
+`git-fetch-pack` and `git-ls-remote` clients, which are invoked
+from `git-fetch`, `git-pull`, and `git-clone`.
 
 This is ideally suited for read-only updates, i.e., pulling from
 git repositories.
@@ -166,7 +166,7 @@ the per-repository configuration file can be used to enable or
 disable them.
 
 upload-pack::
-       This serves `git-fetch-pack` and `git-peek-remote`
+       This serves `git-fetch-pack` and `git-ls-remote`
        clients.  It is enabled by default, but a repository can
        disable it by setting `daemon.uploadpack` configuration
        item to `false`.

diff --git a/git-ls-remote.html b/git-ls-remote.html
index c2ae087e1e6df0ba1fd47532d64f007afe2e7594..cb38a90a42310a278f9dc7acf6b33a06a7cee010 100644 (file)
--- a/git-ls-remote.html
+++ b/git-ls-remote.html
@@ -303,7 +303,7 @@ commit IDs.</p>
         Specify the full path of <a href="git-upload-pack.html">git-upload-pack(1)</a> on the remote\r
         host. This allows listing references from repositories accessed via\r
         SSH and where the SSH daemon does not use the PATH configured by the\r
-        user. Also see the <em>--exec</em> option for <a href="git-peek-remote.html">git-peek-remote(1)</a>.\r
+        user.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:35 UTC\r
+Last updated 18-Dec-2007 06:59:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-remote.txt b/git-ls-remote.txt
index 93e9a60330797070fc50c0df6c0767b7b81f79c0..445bedaa951e5546d67e1f2e556014fa2baa3549 100644 (file)
--- a/git-ls-remote.txt
+++ b/git-ls-remote.txt
@@ -30,7 +30,7 @@ OPTIONS
        Specify the full path of gitlink:git-upload-pack[1] on the remote
        host. This allows listing references from repositories accessed via
        SSH and where the SSH daemon does not use the PATH configured by the
-       user. Also see the '--exec' option for gitlink:git-peek-remote[1].
+       user.
 
 <repository>::
        Location of the repository.  The shorthand defined in

diff --git a/git-peek-remote.html b/git-peek-remote.html
index 740a2585c1e340bbbcfae22f035628f258516fcd..669b971e6bfabf7971716b1114bbdab337457b78 100644 (file)
--- a/git-peek-remote.html
+++ b/git-peek-remote.html
@@ -299,14 +299,6 @@ git-peek-remote(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
---exec=&lt;git-upload-pack&gt;\r
-</dt>\r
-<dd>\r
-<p>\r
-        Same --upload-pack=&lt;git-upload-pack&gt;.\r
-</p>\r
-</dd>\r
-<dt>\r
 &lt;host&gt;\r
 </dt>\r
 <dd>\r
@@ -340,7 +332,7 @@ git-peek-remote(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Nov-2007 04:55:50 UTC\r
+Last updated 18-Dec-2007 06:59:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-peek-remote.txt b/git-peek-remote.txt
index 38a5325af79b8ecdd7893f7cbd5a27da325cb1a5..09b005b10fa2126eee94dbe0d327658ff3c1c905 100644 (file)
--- a/git-peek-remote.txt
+++ b/git-peek-remote.txt
@@ -28,9 +28,6 @@ OPTIONS
        shells, but prefer having a lean .bashrc file (they set most of
        the things up in .bash_profile).
 
-\--exec=<git-upload-pack>::
-       Same \--upload-pack=<git-upload-pack>.
-
 <host>::
        A remote host that houses the repository.  When this
        part is specified, 'git-upload-pack' is invoked via

diff --git a/git-show-ref.html b/git-show-ref.html
index aea2f92ccef4970f3efa80c2fce091235e50f3a9..6100f6ce7d9832fbe0c18a9655405bac27c44d6f 100644 (file)
--- a/git-show-ref.html
+++ b/git-show-ref.html
@@ -447,7 +447,7 @@ flag, so you can do</p>
 </div>\r
 <h2>SEE ALSO</h2>\r
 <div class="sectionbody">\r
-<p><a href="git-ls-remote.html">git-ls-remote(1)</a>, <a href="git-peek-remote.html">git-peek-remote(1)</a></p>\r
+<p><a href="git-ls-remote.html">git-ls-remote(1)</a></p>\r
 </div>\r
 <h2>AUTHORS</h2>\r
 <div class="sectionbody">\r
@@ -460,7 +460,7 @@ Man page by Jonas Fonseca &lt;fonseca@diku.dk&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:49 UTC\r
+Last updated 18-Dec-2007 06:59:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-ref.txt b/git-show-ref.txt
index 2355aa5e86d21766bbde61e3188e1c9539738150..7893a50886ff9a2c6d7a0d068482499b25d756cf 100644 (file)
--- a/git-show-ref.txt
+++ b/git-show-ref.txt
@@ -160,7 +160,7 @@ to get a listing of all tags together with what they dereference.
 
 SEE ALSO
 --------
-gitlink:git-ls-remote[1], gitlink:git-peek-remote[1]
+gitlink:git-ls-remote[1]
 
 AUTHORS
 -------