Autogenerated HTML docs for v1.4.3.3-g01929

diff --git a/diff-format.txt b/diff-format.txt
index ed4ebcbab76c23e599a3f3d62072e16d2cbe7cb1..e4520e28e53661159454e02c703be772d43bbc09 100644 (file)
--- a/diff-format.txt
+++ b/diff-format.txt
@@ -144,8 +144,10 @@ the file that rename/copy produces, respectively.
        dissimilarity index <number>
        index <hash>..<hash> <mode>
 
-3.  TAB, LF, and backslash characters in pathnames are
-    represented as `\t`, `\n`, and `\\`, respectively.
+3.  TAB, LF, double quote and backslash characters in pathnames
+    are represented as `\t`, `\n`, `\"` and `\\`, respectively.
+    If there is need for such substitution then the whole
+    pathname is put in double quotes.
 
 
 combined diff format

diff --git a/everyday.html b/everyday.html
index e6a7289e1cced958bdb6bedc5ed9bb257c67c25c..265949c85bc7e45dd4c4ce2ea1e1acd77b7c29d7 100644 (file)
--- a/everyday.html
+++ b/everyday.html
@@ -889,6 +889,16 @@ example of managing a shared central repository.</p>
 <h3>Examples</h3>\r
 <dl>\r
 <dt>\r
+We assume the following in /etc/services\r
+</dt>\r
+<dd>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ grep 9418 /etc/services\r
+git             9418/tcp                # Git Version Control System</tt></pre>\r
+</div></div>\r
+</dd>\r
+<dt>\r
 Run git-daemon to serve /pub/scm from inetd.\r
 </dt>\r
 <dd>\r
@@ -1035,7 +1045,7 @@ upload to public HTTP server hosted by your ISP.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Oct-2006 08:47:21 UTC\r
+Last updated 27-Oct-2006 09:29:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/everyday.txt b/everyday.txt
index 278161f587497f70643f3805c89e9d87afc790c0..9677671892700ae246dcfe36dc806a548fafe2d2 100644 (file)
--- a/everyday.txt
+++ b/everyday.txt
@@ -353,6 +353,13 @@ example of managing a shared central repository.
 
 Examples
 ~~~~~~~~
+We assume the following in /etc/services::
++
+------------
+$ grep 9418 /etc/services
+git            9418/tcp                # Git Version Control System
+------------
+
 Run git-daemon to serve /pub/scm from inetd.::
 +
 ------------

diff --git a/git-cherry.html b/git-cherry.html
index cec73bfc7bb22ce0c76609e92a461034f143331a..0bdeaf7a6dd6de5cf2012f8501a732e4ca3d275e 100644 (file)
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -272,7 +272,7 @@ git-cherry(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-cherry</em> [-v] &lt;upstream&gt; [&lt;head&gt;]</p>\r
+<p><em>git-cherry</em> [-v] &lt;upstream&gt; [&lt;head&gt;] [&lt;limit&gt;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -282,7 +282,23 @@ is compared against each commit between the fork-point and &lt;upstream&gt;.</p>
 has its id (sha1) reported, prefixed by a symbol.  The ones that have\r
 equivalent change already\r
 in the &lt;upstream&gt; branch are prefixed with a minus (-) sign, and those\r
-that only exist in the &lt;head&gt; branch are prefixed with a plus (+) symbol.</p>\r
+that only exist in the &lt;head&gt; branch are prefixed with a plus (+) symbol:</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>           __*__*__*__*__&gt; &lt;upstream&gt;\r
+          /\r
+fork-point\r
+          \__+__+__-__+__+__-__+__&gt; &lt;head&gt;</tt></pre>\r
+</div></div>\r
+<p>If a &lt;limit&gt; has been given then the commits along the &lt;head&gt; branch up\r
+to and including &lt;limit&gt; are not reported:</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>           __*__*__*__*__&gt; &lt;upstream&gt;\r
+          /\r
+fork-point\r
+          \__*__*__&lt;limit&gt;__-__+__&gt; &lt;head&gt;</tt></pre>\r
+</div></div>\r
 <p>Because git-cherry compares the changeset rather than the commit id\r
 (sha1), you can use git-cherry to find out if a commit you made locally\r
 has been applied &lt;upstream&gt; under a different commit id.  For example,\r
@@ -332,7 +348,7 @@ than pushing or pulling commits directly.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Oct-2006 22:55:22 UTC\r
+Last updated 27-Oct-2006 09:28:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cherry.txt b/git-cherry.txt
index e1bf8ee255e531c1c790ec9f10815f3f972000f8..27b67b81a58956c48452b7aee46b9742ca02e31a 100644 (file)
--- a/git-cherry.txt
+++ b/git-cherry.txt
@@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream
 
 SYNOPSIS
 --------
-'git-cherry' [-v] <upstream> [<head>]
+'git-cherry' [-v] <upstream> [<head>] [<limit>]
 
 DESCRIPTION
 -----------
@@ -18,7 +18,22 @@ Every commit that doesn't exist in the <upstream> branch
 has its id (sha1) reported, prefixed by a symbol.  The ones that have
 equivalent change already
 in the <upstream> branch are prefixed with a minus (-) sign, and those
-that only exist in the <head> branch are prefixed with a plus (+) symbol.
+that only exist in the <head> branch are prefixed with a plus (+) symbol:
+
+               __*__*__*__*__> <upstream>
+              /
+    fork-point
+              \__+__+__-__+__+__-__+__> <head>
+
+
+If a <limit> has been given then the commits along the <head> branch up
+to and including <limit> are not reported:
+
+               __*__*__*__*__> <upstream>
+              /
+    fork-point
+              \__*__*__<limit>__-__+__> <head>
+
 
 Because git-cherry compares the changeset rather than the commit id
 (sha1), you can use git-cherry to find out if a commit you made locally

diff --git a/git-daemon.html b/git-daemon.html
index aeb9fe9dabd4c9a2f6725ee0a9d851d239ae0383..aae799aade06ecd5d177051ce8823b60876df948 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -298,6 +298,7 @@ the offers to a whitelist comprising of those.</p>
 from <tt>git-fetch</tt>, <tt>git-ls-remote</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
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -519,12 +520,30 @@ upload-pack
         item to <tt>false</tt>.\r
 </p>\r
 </dd>\r
+<dt>\r
+upload-archive\r
+</dt>\r
+<dd>\r
+<p>\r
+        This serves <tt>git-archive --remote</tt>.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>EXAMPLES</h2>\r
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
+We assume the following in /etc/services\r
+</dt>\r
+<dd>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ grep 9418 /etc/services\r
+git             9418/tcp                # Git Version Control System</tt></pre>\r
+</div></div>\r
+</dd>\r
+<dt>\r
 git-daemon as inetd server\r
 </dt>\r
 <dd>\r
@@ -605,7 +624,7 @@ they correspond to these IP addresses.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Oct-2006 08:47:15 UTC\r
+Last updated 27-Oct-2006 09:28:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.txt b/git-daemon.txt
index 4b2ea2df318fb85c02cdabd09411dfe36853ed56..993adc7c5adf63f144d7ce257a670363abe18322 100644 (file)
--- a/git-daemon.txt
+++ b/git-daemon.txt
@@ -37,6 +37,8 @@ from `git-fetch`, `git-ls-remote`, and `git-clone`.
 This is ideally suited for read-only updates, i.e., pulling from
 git repositories.
 
+An `upload-archive` also exists to serve `git-archive`.
+
 OPTIONS
 -------
 --strict-paths::
@@ -155,8 +157,18 @@ upload-pack::
        disable it by setting `daemon.uploadpack` configuration
        item to `false`.
 
+upload-archive::
+       This serves `git-archive --remote`.
+
 EXAMPLES
 --------
+We assume the following in /etc/services::
++
+------------
+$ grep 9418 /etc/services
+git            9418/tcp                # Git Version Control System
+------------
+
 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

diff --git a/git-diff-files.html b/git-diff-files.html
index 3f9d971ecf56984cdf5f79be20085bb52a40b030..e00a44e658543815ef1df24cba05dd938f1513e8 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -865,8 +865,10 @@ index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</tt></pre>
 </li>\r
 <li>\r
 <p>\r
-TAB, LF, and backslash characters in pathnames are\r
-    represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.\r
+TAB, LF, double quote and backslash characters in pathnames\r
+    are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively.\r
+    If there is need for such substitution then the whole\r
+    pathname is put in double quotes.\r
 </p>\r
 </li>\r
 </ol>\r
@@ -1007,7 +1009,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Oct-2006 08:47:16 UTC\r
+Last updated 27-Oct-2006 09:28:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index f86166f79b9caf81be28c8e6e98d89dcad582532..28c555225494c30912620cf59e640aabf0edff62 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -861,8 +861,10 @@ index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</tt></pre>
 </li>\r
 <li>\r
 <p>\r
-TAB, LF, and backslash characters in pathnames are\r
-    represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.\r
+TAB, LF, double quote and backslash characters in pathnames\r
+    are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively.\r
+    If there is need for such substitution then the whole\r
+    pathname is put in double quotes.\r
 </p>\r
 </li>\r
 </ol>\r
@@ -1097,7 +1099,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Oct-2006 08:47:17 UTC\r
+Last updated 27-Oct-2006 09:29:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index e5d2eb278d7cb204504fa2f03e140ffbcda2aed8..0bf670f8505f70ac6e81e21c614aa0ce96120b69 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -839,8 +839,10 @@ index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</tt></pre>
 </li>\r
 <li>\r
 <p>\r
-TAB, LF, and backslash characters in pathnames are\r
-    represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.\r
+TAB, LF, double quote and backslash characters in pathnames\r
+    are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively.\r
+    If there is need for such substitution then the whole\r
+    pathname is put in double quotes.\r
 </p>\r
 </li>\r
 </ol>\r
@@ -981,7 +983,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Oct-2006 08:47:18 UTC\r
+Last updated 27-Oct-2006 09:29:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 5069bafc9a5dd79aa9f8f5f04fb42324cd3e17f8..854dc0ebba89706b011d5ce22af3f62d74c30879 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1027,8 +1027,10 @@ index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</tt></pre>
 </li>\r
 <li>\r
 <p>\r
-TAB, LF, and backslash characters in pathnames are\r
-    represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.\r
+TAB, LF, double quote and backslash characters in pathnames\r
+    are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively.\r
+    If there is need for such substitution then the whole\r
+    pathname is put in double quotes.\r
 </p>\r
 </li>\r
 </ol>\r
@@ -1169,7 +1171,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Oct-2006 08:47:19 UTC\r
+Last updated 27-Oct-2006 09:29:02 UTC\r
 </div>\r
 </div>\r
 </body>\r