Autogenerated HTML docs for v1.5.2.2-236-g952c8

diff --git a/RelNotes-1.5.2.2.txt b/RelNotes-1.5.2.2.txt
new file mode 100644 (file)
index 0000000..f6393f8
--- /dev/null
+++ b/RelNotes-1.5.2.2.txt
@@ -0,0 +1,61 @@
+GIT v1.5.2.2 Release Notes
+==========================
+
+Fixes since v1.5.2.1
+--------------------
+
+* Usability fix
+
+  - git-gui is shipped with its updated blame interface.  It is
+    rumored that the older one was not just unusable but was
+    active health hazard, but this one is actually pretty.
+    Please see for yourself.
+
+* Bugfixes
+
+  - "git checkout fubar" was utterly confused when there is a
+    branch fubar and a tag fubar at the same time.  It correctly
+    checks out the branch fubar now.
+
+  - "git clone /path/foo" to clone a local /path/foo.git
+    repository left an incorrect configuration.
+
+  - "git send-email" correctly unquotes RFC 2047 quoted names in
+    the patch-email before using their values.
+
+  - We did not accept number of seconds since epoch older than
+    year 2000 as a valid timestamp.  We now interpret positive
+    integers more than 8 digits as such, which allows us to
+    express timestamps more recent than March 1973.
+
+  - git-cvsimport did not work when you have GIT_DIR to point
+    your repository at a nonstandard location.
+
+  - Some systems (notably, Solaris) lack hstrerror() to make
+    h_errno human readable; prepare a replacement
+    implementation.
+
+  - .gitignore file listed git-core.spec but what we generate is
+    git.spec, and nobody noticed for a long time.
+
+  - "git-merge-recursive" does not try to run file level merge
+    on binary files.
+
+  - "git-branch --track" did not create tracking configuration
+    correctly when the branch name had slash in it.
+
+  - The email address of the user specified with user.email
+    configuration was overriden by EMAIL environment variable.
+
+  - The tree parser did not warn about tree entries with
+    nonsense file modes, and assumed they must be blobs.
+
+  - "git log -z" without any other request to generate diff still
+    invoked the diff machinery, wasting cycles.
+
+* Documentation
+
+  - Many updates to fix stale or missing documentation.
+
+  - Although our documentation was primarily meant to be formatted
+    with AsciiDoc7, formatting with AsciiDoc8 is supported better.

diff --git a/core-tutorial.html b/core-tutorial.html
index 596a8593baaadd8755f1203e01a962b4457ec9de..e01d454dbd319efc6efa147471462bd010bdd07a 100644 (file)
--- a/core-tutorial.html
+++ b/core-tutorial.html
@@ -1968,7 +1968,7 @@ to follow, not easier.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:42 UTC\r
+Last updated 16-Jun-2007 09:49:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/cvs-migration.html b/cvs-migration.html
index f32eaa363f5592480493772fbf34036841b36d31..1945e19882f59c549320fbf006f1326d5db78f5a 100644 (file)
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -416,7 +416,7 @@ repositories without the need for a central maintainer.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:43 UTC\r
+Last updated 16-Jun-2007 09:49:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/diffcore.html b/diffcore.html
index cc0d156e34d74a9d744c2d31e20de12ae3cb3ec3..af18da031f6a7fc892a7a855600e7d745ed3d598 100644 (file)
--- a/diffcore.html
+++ b/diffcore.html
@@ -541,7 +541,7 @@ t</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:43 UTC\r
+Last updated 16-Jun-2007 09:49:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/everyday.html b/everyday.html
index 3ecd4d9a286e80770fdc9a5d79c89e220a0f3f73..65d8887bca84854fe49e403829a90cc312eb13e4 100644 (file)
--- a/everyday.html
+++ b/everyday.html
@@ -1069,7 +1069,7 @@ upload to public HTTP server hosted by your ISP.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:44 UTC\r
+Last updated 16-Jun-2007 09:49:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-add.html b/git-add.html
index c3c0d4202079888d02cb4a72e1bb7c316e054b2d..6f83f74cea7df4187c018b2d005b1adf24910857 100644 (file)
--- a/git-add.html
+++ b/git-add.html
@@ -555,7 +555,7 @@ diff
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:07:59 UTC\r
+Last updated 16-Jun-2007 09:48:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-am.html b/git-am.html
index d56eb47f11e704313f1b91142b213b90a8768812..985e94f759f7c52c22f218009f572034c7852b78 100644 (file)
--- a/git-am.html
+++ b/git-am.html
@@ -509,7 +509,7 @@ names.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:07:59 UTC\r
+Last updated 16-Jun-2007 09:48:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-annotate.html b/git-annotate.html
index 1cba8dd419282fb30b456608d75984ff96958fd4..bf382a3024c44cc6dd04b4df8df1652bf578142b 100644 (file)
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -460,7 +460,7 @@ commit.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:00 UTC\r
+Last updated 16-Jun-2007 09:48:54 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.html b/git-apply.html
index aa905a9cbd0f1840a8795d5be8b64518a1f23a45..5ab05f338e4e70d64ab6645dec4243967ebe808d 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -584,7 +584,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:00 UTC\r
+Last updated 16-Jun-2007 09:48:54 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-archimport.html b/git-archimport.html
index 787077b4a01cc8c11edffc9eac469a3960e1c8fa..cf21f284bbc8208788a1e677ec56303dfcaf4d06 100644 (file)
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -422,7 +422,7 @@ patches that have been traded out-of-sequence between the branches.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:00 UTC\r
+Last updated 16-Jun-2007 09:48:54 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-archive.html b/git-archive.html
index 6a05723ff0d3abf600e1e5ba409318ba2a4c3e2f..6a0f287719d32f849dbd573425c49715e4055723 100644 (file)
--- a/git-archive.html
+++ b/git-archive.html
@@ -421,7 +421,7 @@ git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz
 </p>\r
 </dd>\r
 <dt>\r
-git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip &gt;git-1.4.0.tar.gz\r
+git archive --format=tar --prefix=git-1.4.0/ v1.4.0&#94;{tree} | gzip &gt;git-1.4.0.tar.gz\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -454,7 +454,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 09-Jun-2007 20:38:59 UTC\r
+Last updated 16-Jun-2007 09:48:54 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-bisect.html b/git-bisect.html
index 03ac934625d1ba818feec3288cfab92e064627c0..0351fba692651efef5584327c800bf00a68fafcd 100644 (file)
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -431,7 +431,7 @@ know the outcome.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:01 UTC\r
+Last updated 16-Jun-2007 09:48:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-blame.html b/git-blame.html
index 556ca739916d060e9a8335b20a10ef33262b65fc..323c0589fc5b4e0cd300aeda8fb46caf13259110 100644 (file)
--- a/git-blame.html
+++ b/git-blame.html
@@ -616,7 +616,7 @@ introduced the file with:</p>
 <pre><tt>git log --diff-filter=A --pretty=short -- foo</tt></pre>\r
 </div></div>\r
 <p>and then annotate the change between the commit and its\r
-parents, using <tt>commit^!</tt> notation:</p>\r
+parents, using <tt>commit&#94;!</tt> notation:</p>\r
 <div class="literalblock">\r
 <div class="content">\r
 <pre><tt>git blame -C -C -f $commit^! -- foo</tt></pre>\r
@@ -692,7 +692,7 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Jun-2007 08:29:16 UTC\r
+Last updated 16-Jun-2007 09:48:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.html b/git-branch.html
index e34c687ee2668474856021c669bf7216dcc35e27..22a51bfc72761073e47bceedbd7e50b6ed57bc57 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -526,7 +526,7 @@ a branch and check it out with a single command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:02 UTC\r
+Last updated 16-Jun-2007 09:48:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-bundle.html b/git-bundle.html
index 9c232acd3762eee938901f917a954e65c79f4455..2bf0bfb874e0655a8228acfd1533a0766f222339 100644 (file)
--- a/git-bundle.html
+++ b/git-bundle.html
@@ -424,7 +424,7 @@ network.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:02 UTC\r
+Last updated 16-Jun-2007 09:48:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cat-file.html b/git-cat-file.html
index 5efd2186ed44618546d1cbf6b7aab80e04273b78..4eddb3bfa1d7b7a213dcc0afe052d750f6a7caa9 100644 (file)
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -366,7 +366,7 @@ be returned.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:02 UTC\r
+Last updated 16-Jun-2007 09:48:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-check-attr.html b/git-check-attr.html
index dc679f38d8cc16939b6963dd5eb15adafefc46cb..b02eece8ec95257efafe7ac279639d6a5129ad2c 100644 (file)
--- a/git-check-attr.html
+++ b/git-check-attr.html
@@ -308,7 +308,7 @@ git-check-attr(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:02 UTC\r
+Last updated 16-Jun-2007 09:48:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-check-ref-format.html b/git-check-ref-format.html
index b797ae13faa67cca8307243743cda8f6352e04a6..d49cadca601dbddd659b951a2695f3cfc2de2e97 100644 (file)
--- a/git-check-ref-format.html
+++ b/git-check-ref-format.html
@@ -299,7 +299,7 @@ It cannot have two consecutive dots <tt>..</tt> anywhere;
 <p>\r
 It cannot have ASCII control character (i.e. bytes whose\r
   values are lower than \040, or \177 <tt>DEL</tt>), space, tilde <tt>~</tt>,\r
-  caret <tt>^</tt>, colon <tt>:</tt>, question-mark <tt>?</tt>, asterisk <tt>*</tt>,\r
+  caret <tt>&#94;</tt>, colon <tt>:</tt>, question-mark <tt>?</tt>, asterisk <tt>*</tt>,\r
   or open bracket <tt>[</tt> anywhere;\r
 </p>\r
 </li>\r
@@ -317,13 +317,13 @@ refname expressions (see <a href="git-rev-parse.html">git-rev-parse(1)</a>).  Na
 <li>\r
 <p>\r
 double-dot <tt>..</tt> are often used as in <tt>ref1..ref2</tt>, and in some\r
-  context this notation means <tt>^ref1 ref2</tt> (i.e. not in\r
+  context this notation means <tt>&#94;ref1 ref2</tt> (i.e. not in\r
   ref1 and in ref2).\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-tilde <tt>~</tt> and caret <tt>^</tt> are used to introduce postfix\r
+tilde <tt>~</tt> and caret <tt>&#94;</tt> are used to introduce postfix\r
   <em>nth parent</em> and <em>peel onion</em> operation.\r
 </p>\r
 </li>\r
@@ -343,7 +343,7 @@ colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:03 UTC\r
+Last updated 16-Jun-2007 09:48:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout-index.html b/git-checkout-index.html
index b1b120e2a87274e48a5dbd0bb928f91c368ffd6f..2d35d48289efecd6dbac4acd29718ec1c5ecac85 100644 (file)
--- a/git-checkout-index.html
+++ b/git-checkout-index.html
@@ -511,7 +511,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:03 UTC\r
+Last updated 16-Jun-2007 09:48:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.html b/git-checkout.html
index 0a578c3110c1671b7c8d25cf275d3b7b3f18d817..15ed96d6c68bd1f048ef25e208cf73552d69c062 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -537,7 +537,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:03 UTC\r
+Last updated 16-Jun-2007 09:48:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 143fa28e4df6cc7a3877da0feff635a454f090fd..06101a9657c5cd336a83970d1f03afb3cbf72822 100644 (file)
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -362,7 +362,7 @@ effect to your working tree in a row.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:03 UTC\r
+Last updated 16-Jun-2007 09:48:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cherry.html b/git-cherry.html
index 87962e7bae2d92c8f52052d6e521b6b3e9a95d3d..a859df7d4b35a9a1bac67b06fde38e6cf2437298 100644 (file)
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -356,7 +356,7 @@ than pushing or pulling commits directly.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jun-2007 16:08:47 UTC\r
+Last updated 16-Jun-2007 09:48:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clean.html b/git-clean.html
index c53b40547ff6815fe896ba2f58b65a503a347e43..3b4b4549ffa37a1f540f0f6813f23d661c121b9e 100644 (file)
--- a/git-clean.html
+++ b/git-clean.html
@@ -353,7 +353,7 @@ affected are further limited to those that match them.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:04 UTC\r
+Last updated 16-Jun-2007 09:48:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.html b/git-clone.html
index d13d8559827d7fa31bcd1badd4d8419b750f710a..93dece946cc670d2694afb672125c1a63da6c764 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -521,7 +521,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Jun-2007 20:38:59 UTC\r
+Last updated 16-Jun-2007 09:48:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit-tree.html b/git-commit-tree.html
index 86a6950074de6a670306d6a38f0e19e90ea21183..0c73facf61bceb3947673e0fc0346f74b2354833 100644 (file)
--- a/git-commit-tree.html
+++ b/git-commit-tree.html
@@ -482,7 +482,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:04 UTC\r
+Last updated 16-Jun-2007 09:48:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.html b/git-commit.html
index 64eec8cf2db0409df7c449d03a4590eee5a7abe0..7c1b54e075531eb3f706ce525461942993c8aeb9 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -664,7 +664,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:04 UTC\r
+Last updated 16-Jun-2007 09:48:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.html b/git-config.html
index 59b71498d67f15dfd30ab22df93b64b7fcd2853d..c5c4d2e713700daace0cd005b6b146fc451650ad 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1777,7 +1777,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Jun-2007 01:21:26 UTC\r
+Last updated 16-Jun-2007 09:48:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-convert-objects.html b/git-convert-objects.html
index b9dc4a5256c15a8fa5eb1ce649ce7c2365d889c6..6626df5a1afc2c1800cdd9df189daa113bb2e14e 100644 (file)
--- a/git-convert-objects.html
+++ b/git-convert-objects.html
@@ -292,7 +292,7 @@ git-convert-objects(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:05 UTC\r
+Last updated 16-Jun-2007 09:48:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-count-objects.html b/git-count-objects.html
index aa275b6ff03578e339d6010976f3b199cdcbd08c..a32b81ad37ec3fa27b79873195bf6350c3dab513 100644 (file)
--- a/git-count-objects.html
+++ b/git-count-objects.html
@@ -309,7 +309,7 @@ them, to help you decide when it is a good time to repack.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:05 UTC\r
+Last updated 16-Jun-2007 09:48:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index fb7b13bb6ef5e14aa0a32b2954fef6c2b8f0bd62..99d14320413c7a0586ef6585eabb0f5fdb56d04f 100644 (file)
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -386,7 +386,7 @@ $ cvs commit -F .mgs &lt;files&gt;</tt></pre>
 </div></div>\r
 </dd>\r
 <dt>\r
-Merge pending patches into CVS automatically &#8212; only if you really know what you are doing \r
+Merge pending patches into CVS automatically &#8212; only if you really know what you are doing\r
 </dt>\r
 <dd>\r
 <div class="listingblock">\r
@@ -412,7 +412,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:06 UTC\r
+Last updated 16-Jun-2007 09:48:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index 827711c3c9b8ad8c7ecb074c5ec1a9b887992526..6c423e3a2f1c69e523eeb9cc092126adc2691803 100644 (file)
--- a/git-cvsexportcommit.txt
+++ b/git-cvsexportcommit.txt
@@ -76,7 +76,7 @@ $ git-cvsexportcommit -v <commit-sha1>
 $ cvs commit -F .mgs <files>
 ------------
 
-Merge pending patches into CVS automatically -- only if you really know what you are doing ::
+Merge pending patches into CVS automatically -- only if you really know what you are doing::
 +
 ------------
 $ export GIT_DIR=~/project/.git

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 0ab2f4fe1e7e105ee30216f44f1112e05b5ab24d..2bdc2cf50a42024789fce94c662f69a898cf5dd3 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -526,7 +526,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Jun-2007 08:29:16 UTC\r
+Last updated 16-Jun-2007 09:48:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsserver.html b/git-cvsserver.html
index 9af816deef2a7e4156feab6555098bb5d1cc2686..1a3a627c24b94e3b53849977394bccd63dfb16db 100644 (file)
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -272,9 +272,76 @@ git-cvsserver(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
+<p>SSH:</p>\r
 <div class="verseblock">\r
 <div class="content">export CVS_SERVER=git-cvsserver\r
 <em>cvs</em> -d :ext:user@server/path/repo.git co &lt;HEAD_name&gt;</div></div>\r
+<p>pserver (/etc/inetd.conf):</p>\r
+<div class="verseblock">\r
+<div class="content">cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver</div></div>\r
+<p>Usage:</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-cvsserver</em> [options] [pserver|server] [&lt;directory&gt; &#8230;]</div></div>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<p>All these options obviously only make sense if enforced by the server side.\r
+They have been implemented to resemble the <a href="git-daemon.html">git-daemon(1)</a> options as\r
+closely as possible.</p>\r
+<dl>\r
+<dt>\r
+--base-path &lt;path&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+Prepend <em>path</em> to requested CVSROOT\r
+</p>\r
+</dd>\r
+<dt>\r
+--strict-paths\r
+</dt>\r
+<dd>\r
+<p>\r
+Don't allow recursing into subdirectories\r
+</p>\r
+</dd>\r
+<dt>\r
+--export-all\r
+</dt>\r
+<dd>\r
+<p>\r
+Don't check for <tt>gitcvs.enabled</tt> in config. You also have to specify a list\r
+of allowed directories (see below) if you want to use this option.\r
+</p>\r
+</dd>\r
+<dt>\r
+--version, -V\r
+</dt>\r
+<dd>\r
+<p>\r
+Print version information and exit\r
+</p>\r
+</dd>\r
+<dt>\r
+--help, -h, -H\r
+</dt>\r
+<dd>\r
+<p>\r
+Print usage information and exit\r
+</p>\r
+</dd>\r
+<dt>\r
+&lt;directory&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+You can specify a list of allowed directories. If no directories\r
+are given, all are allowed. This is an additional restriction, gitcvs\r
+access still needs to be enabled by the <tt>gitcvs.enabled</tt> config option\r
+unless <em>--export-all</em> was given, too.\r
+</p>\r
+</dd>\r
+</dl>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -624,7 +691,7 @@ Martin Langhoff &lt;martin@catalyst.net.nz&gt;
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:07 UTC\r
+Last updated 16-Jun-2007 09:48:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsserver.txt b/git-cvsserver.txt
index e5005f02f997437da3251f6c52c6efbdf06557b4..60d0bcf0f31e6b4da6e56d7726ed942744704cbb 100644 (file)
--- a/git-cvsserver.txt
+++ b/git-cvsserver.txt
@@ -7,10 +7,53 @@ git-cvsserver - A CVS server emulator for git
 
 SYNOPSIS
 --------
+
+SSH:
+
 [verse]
 export CVS_SERVER=git-cvsserver
 'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>
 
+pserver (/etc/inetd.conf):
+
+[verse]
+cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
+
+Usage:
+
+[verse]
+'git-cvsserver' [options] [pserver|server] [<directory> ...]
+
+OPTIONS
+-------
+
+All these options obviously only make sense if enforced by the server side.
+They have been implemented to resemble the gitlink:git-daemon[1] options as
+closely as possible.
+
+--base-path <path>::
+Prepend 'path' to requested CVSROOT
+
+--strict-paths::
+Don't allow recursing into subdirectories
+
+--export-all::
+Don't check for `gitcvs.enabled` in config. You also have to specify a list
+of allowed directories (see below) if you want to use this option.
+
+--version, -V::
+Print version information and exit
+
+--help, -h, -H::
+Print usage information and exit
+
+<directory>::
+You can specify a list of allowed directories. If no directories
+are given, all are allowed. This is an additional restriction, gitcvs
+access still needs to be enabled by the `gitcvs.enabled` config option
+unless '--export-all' was given, too.
+
+
 DESCRIPTION
 -----------
 

diff --git a/git-daemon.html b/git-daemon.html
index 401c202cc552885e56a8dd17c30e92e6808fba8a..80ae80c47f0051c619ae69b5f37e5bda273b997d 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -624,7 +624,7 @@ they correspond to these IP addresses.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:07 UTC\r
+Last updated 16-Jun-2007 09:49:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.html b/git-describe.html
index 79cfeda847a3f31d42f186ade67c9a80257c67d8..2acbb3789c520100caf8995da54dc3aa599983c8 100644 (file)
--- a/git-describe.html
+++ b/git-describe.html
@@ -428,7 +428,7 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:07 UTC\r
+Last updated 16-Jun-2007 09:49:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.html b/git-diff-files.html
index 79cc56c814dde7d2592f2d3a8b02f48229fda8a9..cba19abeb190c009da231cebcfd57d976ef552a9 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -1070,7 +1070,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jun-2007 16:08:47 UTC\r
+Last updated 16-Jun-2007 09:49:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 50167c8884e97e865663e117127a45024ff848d9..2b273e0a96146c970840f746e83e8465f6fede2e 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -1152,7 +1152,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jun-2007 16:08:47 UTC\r
+Last updated 16-Jun-2007 09:49:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 047f4e4febe07448423b2de6c03bcacad2b5b323..daf06da1c6f65af7bfb369ea520e6f2ff9545091 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1517,7 +1517,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jun-2007 16:08:48 UTC\r
+Last updated 16-Jun-2007 09:49:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 45a5aef28378e3acf7e74c752edd63515a9d588e..4d450d5d58b024e0bc12a347ba1d56ee40525ab0 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -861,7 +861,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jun-2007 16:08:48 UTC\r
+Last updated 16-Jun-2007 09:49:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fast-import.html b/git-fast-import.html
index f240e9aa5bd6ca86c1d847d210f30a68be1c3c83..1d0ce26cd57fda75c669673453e7c8646956cf20 100644 (file)
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -728,9 +728,9 @@ current branch value should be written as:</p>
 <div class="content">\r
 <pre><tt>        from refs/heads/branch^0</tt></pre>\r
 </div></div>\r
-<p>The <tt>^0</tt> suffix is necessary as fast-import does not permit a branch to\r
+<p>The <tt>&#94;0</tt> suffix is necessary as fast-import does not permit a branch to\r
 start from itself, and the branch is created in memory before the\r
-<tt>from</tt> command is even read from the input.  Adding <tt>^0</tt> will force\r
+<tt>from</tt> command is even read from the input.  Adding <tt>&#94;0</tt> will force\r
 fast-import to resolve the commit through Git's revision parsing library,\r
 rather than its internal branch table, thereby loading in the\r
 existing value of the branch.</p>\r
@@ -1203,7 +1203,7 @@ memory footprint (less than 2.7 MiB per active branch).</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:10 UTC\r
+Last updated 16-Jun-2007 09:49:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fetch-pack.html b/git-fetch-pack.html
index e48efe44ed77173a778dac75144d72911bdc2151..94597fd198da11f81440d6272c1de315dd1851ec 100644 (file)
--- a/git-fetch-pack.html
+++ b/git-fetch-pack.html
@@ -420,7 +420,7 @@ have a common ancestor commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:10 UTC\r
+Last updated 16-Jun-2007 09:49:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fetch.html b/git-fetch.html
index 9709ad90fabc4ddf2916c9b3ab69ad68d44980dd..8ad8786759e491cdb8fdcca2917b6258e09f9326 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -651,7 +651,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:11 UTC\r
+Last updated 16-Jun-2007 09:49:04 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 21aa2faa17f89b493fb9c205e6bf8a6a16c2e49e..0614013c056f8d8e63a1a78911f594779e257f7b 100644 (file)
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -349,7 +349,7 @@ merge.summary
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:11 UTC\r
+Last updated 16-Jun-2007 09:49:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index f866cd1d976d49b8a45103f4134e90635915b5e1..7033c9e4dd4ba024faf15141b57f9b5213fc8e1c 100644 (file)
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -491,7 +491,7 @@ eval "$eval"</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:11 UTC\r
+Last updated 16-Jun-2007 09:49:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.html b/git-format-patch.html
index c5cd6df1f59eeb4375389eadaaf21ed5eff0de51..b5c99f8b18a1ed9bcdcf9d59f095c49ccdb3a1e1 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -903,7 +903,7 @@ git-format-patch -3
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jun-2007 16:08:49 UTC\r
+Last updated 16-Jun-2007 09:49:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fsck-objects.html b/git-fsck-objects.html
index 9d3b974fbca4a61b3e74d2b66c4a2a28424d58d8..1f53f46383cd8218e91286abaf396f6d6aed578a 100644 (file)
--- a/git-fsck-objects.html
+++ b/git-fsck-objects.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:12 UTC\r
+Last updated 16-Jun-2007 09:49:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fsck.html b/git-fsck.html
index 7308735b5f3b2d49fb2c654ab426f4a80a5f2419..051d7cc2f2acf9f5d6df722d8307d6112e73eb9a 100644 (file)
--- a/git-fsck.html
+++ b/git-fsck.html
@@ -510,7 +510,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:12 UTC\r
+Last updated 16-Jun-2007 09:49:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-gc.html b/git-gc.html
index dcb37a51cb78e5f774638518b9f3c678d8d91bc1..2fb1877f1c5e7879a6bab1eefcfa045fe605128a 100644 (file)
--- a/git-gc.html
+++ b/git-gc.html
@@ -367,7 +367,7 @@ more details.  This defaults to 10.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:13 UTC\r
+Last updated 16-Jun-2007 09:49:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html
index 16b4c5418a4ea5e9002ffa1a3162830f48451dd5..a42b36d33520e8e7ae7e55bb6ceacb4f0dbf1a12 100644 (file)
--- a/git-get-tar-commit-id.html
+++ b/git-get-tar-commit-id.html
@@ -298,7 +298,7 @@ a tree ID instead of a commit ID or tag.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:13 UTC\r
+Last updated 16-Jun-2007 09:49:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.html b/git-grep.html
index 4105fe2e1b7ea0710b217d100cbb1b1983c21100..ac680bca88994d0bc15e65ef45d601741d0c40a7 100644 (file)
--- a/git-grep.html
+++ b/git-grep.html
@@ -528,7 +528,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:14 UTC\r
+Last updated 16-Jun-2007 09:49:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-hash-object.html b/git-hash-object.html
index 7899acda34a936b0ac9a227fdc4c0f4f36653628..38042d778f4f08aa8f9078f9fa87717ee2a84793 100644 (file)
--- a/git-hash-object.html
+++ b/git-hash-object.html
@@ -327,7 +327,7 @@ specified, it defaults to "blob".</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:13 UTC\r
+Last updated 16-Jun-2007 09:49:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-fetch.html b/git-http-fetch.html
index 1fcb5ee77e0abc26facc23ad12198a88a5e62b5a..8ecaf7763508774b18a1d590a5efd27438c7ffa9 100644 (file)
--- a/git-http-fetch.html
+++ b/git-http-fetch.html
@@ -369,7 +369,7 @@ commit-id
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:14 UTC\r
+Last updated 16-Jun-2007 09:49:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-push.html b/git-http-push.html
index d2d503af0f5f23fc0fd8e5fdd487f1259e9e1738..d8dbfed7a198b9ef1ca5e65e3f963b1638a4a0f6 100644 (file)
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -412,7 +412,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:14 UTC\r
+Last updated 16-Jun-2007 09:49:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-imap-send.html b/git-imap-send.html
index 55d5402ef888f69b60d2e81ad01da31acb066556..5ceace02ef2bd95e56a4fdc46736668e749d8bb6 100644 (file)
--- a/git-imap-send.html
+++ b/git-imap-send.html
@@ -320,7 +320,7 @@ configuration file (shown with examples):</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:14 UTC\r
+Last updated 16-Jun-2007 09:49:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-index-pack.html b/git-index-pack.html
index 2e7a7fe01458c4b8fa3b455b5df2b4a0696504ae..d54ce56831f8c386f1d5546d1c8244576498fed0 100644 (file)
--- a/git-index-pack.html
+++ b/git-index-pack.html
@@ -398,7 +398,7 @@ mentioned above.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:15 UTC\r
+Last updated 16-Jun-2007 09:49:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-init-db.html b/git-init-db.html
index 04f08ce11d306096f5221c9e40500b5cbf2eb6e5..278cfc13ca8739b5e69e32df554870b3d3e59a03 100644 (file)
--- a/git-init-db.html
+++ b/git-init-db.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:15 UTC\r
+Last updated 16-Jun-2007 09:49:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-init.html b/git-init.html
index 55e4042f7a83e8737870b78ba8b19cadeb63d8a6..b3216462e478248811e43074d505ed6395c861c4 100644 (file)
--- a/git-init.html
+++ b/git-init.html
@@ -395,7 +395,7 @@ add all existing file to the index
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:15 UTC\r
+Last updated 16-Jun-2007 09:49:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-instaweb.html b/git-instaweb.html
index 69e7435f153958f6ae248793ff2f9a4a615c0411..0d4ec58cb0b81b74d67981fe22da96ae9061fd71 100644 (file)
--- a/git-instaweb.html
+++ b/git-instaweb.html
@@ -390,7 +390,7 @@ repository.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:15 UTC\r
+Last updated 16-Jun-2007 09:49:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-local-fetch.html b/git-local-fetch.html
index c14772286d3482795fc698b50670516f299cc417..927b5eb82283e3cc9b0c38fb9e242ada7d874900 100644 (file)
--- a/git-local-fetch.html
+++ b/git-local-fetch.html
@@ -390,7 +390,7 @@ git-local-fetch(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:16 UTC\r
+Last updated 16-Jun-2007 09:49:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index 6fc1ab83408548262bf4b94539c6efc5ddc68f42..db601f0f5e6b7f60f9356d8ebd26bb714fc60849 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -787,7 +787,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:16 UTC\r
+Last updated 16-Jun-2007 09:49:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-lost-found.html b/git-lost-found.html
index 983efdb0a6badc022a9983a2febf6f82f3968a17..16eccd680fa5769d6ba04b88ba552652dcee8c4f 100644 (file)
--- a/git-lost-found.html
+++ b/git-lost-found.html
@@ -338,7 +338,7 @@ $ git rev-parse not-lost-anymore
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:16 UTC\r
+Last updated 16-Jun-2007 09:49:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-files.html b/git-ls-files.html
index cbc8db28eaff5d664e5c69a64946cfa550ee9b68..189d4dd1140f6462cd8cdfa3c4f7fa97b5c4e834 100644 (file)
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -603,7 +603,7 @@ pattern file appears in.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:16 UTC\r
+Last updated 16-Jun-2007 09:49:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-remote.html b/git-ls-remote.html
index f39b346d47de7d475271e46804629d2162cb7fef..99557a62e0183fda35eaaeb7566ec80efc49429d 100644 (file)
--- a/git-ls-remote.html
+++ b/git-ls-remote.html
@@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:17 UTC\r
+Last updated 16-Jun-2007 09:49:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-tree.html b/git-ls-tree.html
index db37157ece0e78bfc5bca89e6b276618d6fb6a1f..c16a6c101e312827664a9eebca70aad18b2a1141 100644 (file)
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -416,7 +416,7 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:17 UTC\r
+Last updated 16-Jun-2007 09:49:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mailinfo.html b/git-mailinfo.html
index d9b9026e3261a9a34db854229cdca8bc94a79da6..3003479cfa55717e60f222d0b649862f7eccc8a1 100644 (file)
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -357,7 +357,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:17 UTC\r
+Last updated 16-Jun-2007 09:49:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mailsplit.html b/git-mailsplit.html
index 1c80b0c5b4e565d8fe9fac51c3df34dd00149e43..e729bca84e8568400ec40b8aedff92bbbf8f45fc 100644 (file)
--- a/git-mailsplit.html
+++ b/git-mailsplit.html
@@ -362,7 +362,7 @@ and Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:17 UTC\r
+Last updated 16-Jun-2007 09:49:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-base.html b/git-merge-base.html
index 1184c8a038b4c4d3353ab53a889cf85dda0d9c41..234ff493631ec80df313850906f6591d5a5133e6 100644 (file)
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -312,7 +312,7 @@ relied on to decide in any particular way.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:17 UTC\r
+Last updated 16-Jun-2007 09:49:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-file.html b/git-merge-file.html
index 341957b4b9a852539960a05f9dfecdee25ad8a7f..ad06b957910825ac93046e0d6e6bdbf9d44f4829 100644 (file)
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -377,7 +377,7 @@ with parts copied from the original documentation of RCS merge.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:18 UTC\r
+Last updated 16-Jun-2007 09:49:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-index.html b/git-merge-index.html
index b2017dd17c6957110daf5787e1520a34cb7948e3..34261ba3f889dd7dcb5d843d998e030209b278c1 100644 (file)
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:18 UTC\r
+Last updated 16-Jun-2007 09:49:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-one-file.html b/git-merge-one-file.html
index 343ee878723cf8a931967189c3457d1d218c8ad1..d6de2cd161ae636d0f25dd5ced96c133adc27eef 100644 (file)
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -294,7 +294,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:18 UTC\r
+Last updated 16-Jun-2007 09:49:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-tree.html b/git-merge-tree.html
index 7183ec2cfa7dc3808a832b9c3ed8806a0d393f4c..4a5c053c47bc7c1303374fd3915a08173bc7c31a 100644 (file)
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -300,7 +300,7 @@ entries that match &lt;branch1&gt; tree.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:18 UTC\r
+Last updated 16-Jun-2007 09:49:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.html b/git-merge.html
index ea2db072150c8bede78042bef533d5864f277f2f..9f4fa0b0a335c79385c3b1348fbcdc0655dd87f4 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -579,7 +579,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:19 UTC\r
+Last updated 16-Jun-2007 09:49:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mergetool.html b/git-mergetool.html
index 523b819b8328925252a70db8a094ce7a13ce4a19..761e5418e2f45d9bc897db824c447a97c8ca3848 100644 (file)
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -316,7 +316,7 @@ will pick a suitable default.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Jun-2007 01:21:26 UTC\r
+Last updated 16-Jun-2007 09:49:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mktag.html b/git-mktag.html
index 4c14f2a12a3dd74409774efefe72653542094cbe..bc11333de445fa39e985f7dfae4fc38357466d5f 100644 (file)
--- a/git-mktag.html
+++ b/git-mktag.html
@@ -310,7 +310,7 @@ care about, but that can be verified with gpg.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Jun-2007 01:21:27 UTC\r
+Last updated 16-Jun-2007 09:49:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mktree.html b/git-mktree.html
index 0813228907e82b52721014751294bd2ed467cd9a..955385b37dd9135ce8af1b26a6cf8b0d5ee50812 100644 (file)
--- a/git-mktree.html
+++ b/git-mktree.html
@@ -307,7 +307,7 @@ built is written to the standard output.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:19 UTC\r
+Last updated 16-Jun-2007 09:49:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mv.html b/git-mv.html
index bd528a417a54908f433d4c07fd5175eafa97b6ce..61df374864162a7f09ec45ef6424e2a1ae2af2cf 100644 (file)
--- a/git-mv.html
+++ b/git-mv.html
@@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:20 UTC\r
+Last updated 16-Jun-2007 09:49:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-name-rev.html b/git-name-rev.html
index cf85809ee76d1cf3463b5a2a25226ca78ac6b7fd..e138618a40e079d2443eeef2672b41506f89a4e3 100644 (file)
--- a/git-name-rev.html
+++ b/git-name-rev.html
@@ -364,7 +364,7 @@ not the context.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:20 UTC\r
+Last updated 16-Jun-2007 09:49:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-p4import.html b/git-p4import.html
index 605303470226a4447bd54987f81c744622f091b2..23be6c4d37804d3bdd148ca3cd9689e2cd878a77 100644 (file)
--- a/git-p4import.html
+++ b/git-p4import.html
@@ -463,7 +463,7 @@ of mappings with each line containing one mapping in the format:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:21 UTC\r
+Last updated 16-Jun-2007 09:49:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.html b/git-pack-objects.html
index 72504dca802954c1469daefdd20205e622d31ec8..fd8b144b31acf0abf7dcef69296445bb6dab7bd5 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -538,7 +538,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:21 UTC\r
+Last updated 16-Jun-2007 09:49:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-redundant.html b/git-pack-redundant.html
index 340467d99339da54924ea5774d23563badf508e5..bfdbbd005508fed5f83b39e08188c0860acd5777 100644 (file)
--- a/git-pack-redundant.html
+++ b/git-pack-redundant.html
@@ -335,7 +335,7 @@ objects.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:22 UTC\r
+Last updated 16-Jun-2007 09:49:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-refs.html b/git-pack-refs.html
index 1d31042251f83a8ae9f1f79fcc0b30920d92b07a..522dee9e101068bc0470b648ccab0812d4cd8e55 100644 (file)
--- a/git-pack-refs.html
+++ b/git-pack-refs.html
@@ -336,7 +336,7 @@ hierarchy after packing them.  This option tells it not to.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:22 UTC\r
+Last updated 16-Jun-2007 09:49:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-parse-remote.html b/git-parse-remote.html
index 91b32200ebdaf7b9e922d5b188a7f37c1afa91b6..47c90700cadf710c3114936359ba4586adedcdc1 100644 (file)
--- a/git-parse-remote.html
+++ b/git-parse-remote.html
@@ -326,7 +326,7 @@ get_remote_refs_for_push
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:22 UTC\r
+Last updated 16-Jun-2007 09:49:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-patch-id.html b/git-patch-id.html
index 0018ca487854e72c5bec2511234417020e86e5ec..eef06d7476f2ca3a0a5b92c32636ff4635cad7b6 100644 (file)
--- a/git-patch-id.html
+++ b/git-patch-id.html
@@ -314,7 +314,7 @@ This can be used to make a mapping from patch ID to commit ID.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:22 UTC\r
+Last updated 16-Jun-2007 09:49:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-peek-remote.html b/git-peek-remote.html
index 4126d040e02a559094ab56b9e057f427c52c271c..87844a6571676e13f12364931e21aef4cdb6afab 100644 (file)
--- a/git-peek-remote.html
+++ b/git-peek-remote.html
@@ -341,7 +341,7 @@ stores them in the local repository under the same name.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:23 UTC\r
+Last updated 16-Jun-2007 09:49:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-prune-packed.html b/git-prune-packed.html
index f21779aa912c35f24773066bd8d65b96c6ca19d9..016a7246154c661a2d5f5a3530d38530dd8b7f5c 100644 (file)
--- a/git-prune-packed.html
+++ b/git-prune-packed.html
@@ -325,7 +325,7 @@ disk storage, etc.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:23 UTC\r
+Last updated 16-Jun-2007 09:49:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-prune.html b/git-prune.html
index 37dfd1fe16bb1008d64238494dc851e4dfbb3ddd..97edc8c017efd54e315411f452c832fe6de693b6 100644 (file)
--- a/git-prune.html
+++ b/git-prune.html
@@ -340,7 +340,7 @@ borrows from your repository via its
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Jun-2007 20:38:59 UTC\r
+Last updated 16-Jun-2007 09:49:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.html b/git-pull.html
index 1d6b62e2a76cdf3e2048523134cad1f98809aaca..374eb3e8ba4117eb546503461fceebf76f2beb16 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -896,7 +896,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:24 UTC\r
+Last updated 16-Jun-2007 09:49:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.html b/git-push.html
index 0d24c0863ff998b4059a015041a69c3da13285b3..52d860e2d91b3639787dcaf4b9fd9fdf60b60f87 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -320,9 +320,8 @@ corresponding remotes file---see below), then all the
 refs that exist both on the local side and on the remote\r
 side are updated.</p>\r
 <p><tt>tag &lt;tag&gt;</tt> means the same as <tt>refs/tags/&lt;tag&gt;:refs/tags/&lt;tag&gt;</tt>.</p>\r
-<p>A parameter &lt;ref&gt; without a colon is equivalent to\r
-&lt;ref&gt;<tt>:</tt>&lt;ref&gt;, hence updates &lt;ref&gt; in the destination from &lt;ref&gt;\r
-in the source.</p>\r
+<p>A parameter &lt;ref&gt; without a colon pushes the &lt;ref&gt; from the source\r
+repository to the destination repository under the same name.</p>\r
 <p>Pushing an empty &lt;src&gt; allows you to delete the &lt;dst&gt; ref from\r
 the remote repository.</p>\r
 </dd>\r
@@ -539,6 +538,42 @@ corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>
         Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
 </div></div>\r
 </div>\r
+<h2>Examples</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+git push origin master\r
+</dt>\r
+<dd>\r
+<p>\r
+        Find a ref that matches <tt>master</tt> in the source repository\r
+        (most likely, it would find <tt>refs/heads/master</tt>), and update\r
+        the same ref (e.g. <tt>refs/heads/master</tt>) in <tt>origin</tt> repository\r
+        with it.\r
+</p>\r
+</dd>\r
+<dt>\r
+git push origin :experimental\r
+</dt>\r
+<dd>\r
+<p>\r
+        Find a ref that matches <tt>experimental</tt> in the <tt>origin</tt> repository\r
+        (e.g. <tt>refs/heads/experimental</tt>), and delete it.\r
+</p>\r
+</dd>\r
+<dt>\r
+git push origin master:satellite/master\r
+</dt>\r
+<dd>\r
+<p>\r
+        Find a ref that matches <tt>master</tt> in the source repository\r
+        (most likely, it would find <tt>refs/heads/master</tt>), and update\r
+        the ref that matches <tt>satellite/master</tt> (most likely, it would\r
+        be <tt>refs/remotes/satellite/master</tt>) in <tt>origin</tt> repository with it.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Junio C Hamano &lt;junkio@cox.net&gt;, later rewritten in C\r
@@ -554,7 +589,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:24 UTC\r
+Last updated 16-Jun-2007 09:49:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.txt b/git-push.txt
index 366c5dbdce69854e7cc1e085cdf53e0e88f7bcb2..665f6dc709207725daa9e7dd81d150a9aac0f7cb 100644 (file)
--- a/git-push.txt
+++ b/git-push.txt
@@ -53,9 +53,8 @@ side are updated.
 +
 `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
 +
-A parameter <ref> without a colon is equivalent to
-<ref>`:`<ref>, hence updates <ref> in the destination from <ref>
-in the source.
+A parameter <ref> without a colon pushes the <ref> from the source
+repository to the destination repository under the same name.
 +
 Pushing an empty <src> allows you to delete the <dst> ref from
 the remote repository.
@@ -98,6 +97,26 @@ the remote repository.
 
 include::urls.txt[]
 
+
+Examples
+--------
+
+git push origin master::
+       Find a ref that matches `master` in the source repository
+       (most likely, it would find `refs/heads/master`), and update
+       the same ref (e.g. `refs/heads/master`) in `origin` repository
+       with it.
+
+git push origin :experimental::
+       Find a ref that matches `experimental` in the `origin` repository
+       (e.g. `refs/heads/experimental`), and delete it.
+
+git push origin master:satellite/master::
+       Find a ref that matches `master` in the source repository
+       (most likely, it would find `refs/heads/master`), and update
+       the ref that matches `satellite/master` (most likely, it would
+       be `refs/remotes/satellite/master`) in `origin` repository with it.
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>, later rewritten in C

diff --git a/git-quiltimport.html b/git-quiltimport.html
index 6861a3660e3f2238868246c8a82b6bb4d64de65a..aeabca4bee08b83990ef1b1e0497614a70a4deef 100644 (file)
--- a/git-quiltimport.html
+++ b/git-quiltimport.html
@@ -339,7 +339,7 @@ variable.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:25 UTC\r
+Last updated 16-Jun-2007 09:49:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-read-tree.html b/git-read-tree.html
index c0b0cd7505dc22e65d925729a6947927416a5e29..d1d94ba6cecbc77304a3035cc1ecc39fb2054e12 100644 (file)
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -700,7 +700,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:25 UTC\r
+Last updated 16-Jun-2007 09:49:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.html b/git-rebase.html
index a01cad5117cafb34fb152c1d18277124726e503a..2ccbda92a39c05de896a543887ff3965f8d2e337 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -596,7 +596,7 @@ a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:26 UTC\r
+Last updated 16-Jun-2007 09:49:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-receive-pack.html b/git-receive-pack.html
index 814b4d02f1c23404dc08891711d1300ad045db31..6de8debec27418fcbc1121819569d4de25696e12 100644 (file)
--- a/git-receive-pack.html
+++ b/git-receive-pack.html
@@ -425,7 +425,7 @@ exec git-update-server-info</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:26 UTC\r
+Last updated 16-Jun-2007 09:49:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reflog.html b/git-reflog.html
index ea74b378440f0b3b4175840f6b64f72facf09b13..8a0f25ce57418e0d60bdafe9061403084eb96609 100644 (file)
--- a/git-reflog.html
+++ b/git-reflog.html
@@ -343,7 +343,7 @@ the current branch. It is basically an alias for <em>git log -g --abbrev-commit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:26 UTC\r
+Last updated 16-Jun-2007 09:49:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-relink.html b/git-relink.html
index 409e44b274e2e0ffa39c59c960541ccfe2f38fb9..38d1ca80c377afbf0a46bf2e438e8d1202980043 100644 (file)
--- a/git-relink.html
+++ b/git-relink.html
@@ -315,7 +315,7 @@ if they are hardlinked, and replace one with a hardlink to the other if not.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:27 UTC\r
+Last updated 16-Jun-2007 09:49:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-remote.html b/git-remote.html
index d11c91b1fdba43d8749ebbfd5f9ffc9044429e3d..dffebf8b9108840f6bcb950672a92d024c2e5bcf 100644 (file)
--- a/git-remote.html
+++ b/git-remote.html
@@ -410,7 +410,7 @@ $ git merge origin</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:27 UTC\r
+Last updated 16-Jun-2007 09:49:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repack.html b/git-repack.html
index d3ddc82ae111e0830bb8bc23c5710f9e7df62a9d..616d35764fd6bfdfb38bacf90417546a4a855afb 100644 (file)
--- a/git-repack.html
+++ b/git-repack.html
@@ -404,7 +404,7 @@ that way can try to use older git with it).</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:27 UTC\r
+Last updated 16-Jun-2007 09:49:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repo-config.html b/git-repo-config.html
index ba818af0b6fa6d382fd197e7fcc847f661535b93..9a169472f360f24a0e780fe0e0c768ffba3ee74b 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -281,7 +281,7 @@ documentation of that command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:28 UTC\r
+Last updated 16-Jun-2007 09:49:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-request-pull.html b/git-request-pull.html
index 622e36d67ae1a0d36242d328593893758cc852cc..8ff8f17deaee97e4c819bd4014104176c62d0ab4 100644 (file)
--- a/git-request-pull.html
+++ b/git-request-pull.html
@@ -322,7 +322,7 @@ the given URL in the generated summary.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:28 UTC\r
+Last updated 16-Jun-2007 09:49:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rerere.html b/git-rerere.html
index d5d0aaa03f4c7458b28d2fcc217eecb8b3f8fbac..7caf338cef313e7bf9d61ae8ba954a13ac80a63b 100644 (file)
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -481,7 +481,7 @@ conflict.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:28 UTC\r
+Last updated 16-Jun-2007 09:49:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.html b/git-reset.html
index b262198f48ccf365556957a428b17f909c6f88bb..935e9721c8c601af062f5565f5aac97c0850d891 100644 (file)
--- a/git-reset.html
+++ b/git-reset.html
@@ -567,7 +567,7 @@ At this point the index file still has all the WIP changes you
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:28 UTC\r
+Last updated 16-Jun-2007 09:49:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.html b/git-rev-list.html
index 53068fb445deb2f8afc435e31bc016f7965534dc..8324a5e36e3229d27718d757859b30fd6a988671 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -305,7 +305,7 @@ git-rev-list(1) Manual Page
 <p>Lists commit objects in reverse chronological order starting at the\r
 given commit(s), taking ancestry relationship into account.  This is\r
 useful to produce human-readable log output.</p>\r
-<p>Commits which are stated with a preceding <em>^</em> cause listing to\r
+<p>Commits which are stated with a preceding <em>&#94;</em> cause listing to\r
 stop at that point. Their parents are implied. Thus the following\r
 command:</p>\r
 <div class="listingblock">\r
@@ -315,7 +315,7 @@ command:</p>
 <p>means "list all the commits which are included in <em>foo</em> and <em>bar</em>, but\r
 not in <em>baz</em>".</p>\r
 <p>A special notation "<em>&lt;commit1&gt;</em>..<em>&lt;commit2&gt;</em>" can be used as a\r
-short-hand for "^<em>&lt;commit1&gt;</em> <em>&lt;commit2&gt;</em>". For example, either of\r
+short-hand for "&#94;<em>&lt;commit1&gt;</em> <em>&lt;commit2&gt;</em>". For example, either of\r
 the following may be used interchangeably:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
@@ -584,7 +584,7 @@ limiting may be applied.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Reverses the meaning of the <em>^</em> prefix (or lack thereof)\r
+        Reverses the meaning of the <em>&#94;</em> prefix (or lack thereof)\r
         for all following revision specifiers, up to the next <em>--not</em>.\r
 </p>\r
 </dd>\r
@@ -631,7 +631,7 @@ excluded from the output.
         Instead of walking the commit ancestry chain, walk\r
         reflog entries from the most recent one to older ones.\r
         When this option is used you cannot specify commits to\r
-        exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,\r
+        exclude (that is, <em>&#94;commit</em>, <em>commit1..commit2</em>,\r
         nor <em>commit1&#8230;commit2</em> notations cannot be used).<br />\r
 With <em>--pretty</em> format other than oneline (for obvious reasons),\r
 this causes the output to have two extra lines of information\r
@@ -1074,7 +1074,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 08-Jun-2007 16:08:28 UTC\r
+Last updated 16-Jun-2007 09:49:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 0777e5f8778c43d6921a44b88533aa57cd663ad1..0ebcd0997c59e05ddc08520972ef950c4b51c1bd 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -356,8 +356,8 @@ distinguish between them.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        When showing object names, prefix them with <em>^</em> and\r
-        strip <em>^</em> prefix from the object names that already have\r
+        When showing object names, prefix them with <em>&#94;</em> and\r
+        strip <em>&#94;</em> prefix from the object names that already have\r
         one.\r
 </p>\r
 </dd>\r
@@ -367,7 +367,7 @@ distinguish between them.</p>
 <dd>\r
 <p>\r
         Usually the object names are output in SHA1 form (with\r
-        possible <em>^</em> prefix); this option makes them output in a\r
+        possible <em>&#94;</em> prefix); this option makes them output in a\r
         form as close to the original input as possible.\r
 </p>\r
 </dd>\r
@@ -566,11 +566,11 @@ You can use the <em>@</em> construct with an empty ref part to get at a
 </li>\r
 <li>\r
 <p>\r
-A suffix <em>^</em> to a revision parameter means the first parent of\r
-  that commit object.  <em>^&lt;n&gt;</em> means the &lt;n&gt;th parent (i.e.\r
-  <em>rev^</em>\r
-  is equivalent to <em>rev^1</em>).  As a special rule,\r
-  <em>rev^0</em> means the commit itself and is used when <em>rev</em> is the\r
+A suffix <em>&#94;</em> to a revision parameter means the first parent of\r
+  that commit object.  <em>&#94;&lt;n&gt;</em> means the &lt;n&gt;th parent (i.e.\r
+  <em>rev&#94;</em>\r
+  is equivalent to <em>rev&#94;1</em>).  As a special rule,\r
+  <em>rev&#94;0</em> means the commit itself and is used when <em>rev</em> is the\r
   object name of a tag object that refers to a commit object.\r
 </p>\r
 </li>\r
@@ -579,25 +579,25 @@ A suffix <em>^</em> to a revision parameter means the first parent of
 A suffix <em>&#126;&lt;n&gt;</em> to a revision parameter means the commit\r
   object that is the &lt;n&gt;th generation grand-parent of the named\r
   commit object, following only the first parent.  I.e. rev~3 is\r
-  equivalent to rev^^^ which is equivalent to\r
-  rev^1^1^1.  See below for a illustration of\r
+  equivalent to rev&#94;&#94;&#94; which is equivalent to\r
+  rev&#94;1&#94;1&#94;1.  See below for a illustration of\r
   the usage of this form.\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-A suffix <em>^</em> followed by an object type name enclosed in\r
-  brace pair (e.g. <tt>v0.99.8^{commit}</tt>) means the object\r
+A suffix <em>&#94;</em> followed by an object type name enclosed in\r
+  brace pair (e.g. <tt>v0.99.8&#94;{commit}</tt>) means the object\r
   could be a tag, and dereference the tag recursively until an\r
   object of that type is found or the object cannot be\r
-  dereferenced anymore (in which case, barf).  <tt>rev^0</tt>\r
-  introduced earlier is a short-hand for <tt>rev^{commit}</tt>.\r
+  dereferenced anymore (in which case, barf).  <tt>rev&#94;0</tt>\r
+  introduced earlier is a short-hand for <tt>rev&#94;{commit}</tt>.\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-A suffix <em>^</em> followed by an empty brace pair\r
-  (e.g. <tt>v0.99.8^{}</tt>) means the object could be a tag,\r
+A suffix <em>&#94;</em> followed by an empty brace pair\r
+  (e.g. <tt>v0.99.8&#94;{}</tt>) means the object could be a tag,\r
   and dereference the tag recursively until a non-tag object is\r
   found.\r
 </p>\r
@@ -664,11 +664,11 @@ of commits, not just a single commit.  To these commands,
 specifying a single revision with the notation described in the\r
 previous section means the set of commits reachable from that\r
 commit, following the commit ancestry chain.</p>\r
-<p>To exclude commits reachable from a commit, a prefix <tt>^</tt>\r
-notation is used.  E.g. "<tt>^r1 r2</tt>" means commits reachable\r
+<p>To exclude commits reachable from a commit, a prefix <tt>&#94;</tt>\r
+notation is used.  E.g. "<tt>&#94;r1 r2</tt>" means commits reachable\r
 from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p>\r
 <p>This set operation appears so often that there is a shorthand\r
-for it.  "<tt>r1..r2</tt>" is equivalent to "<tt>^r1 r2</tt>".  It is\r
+for it.  "<tt>r1..r2</tt>" is equivalent to "<tt>&#94;r1 r2</tt>".  It is\r
 the difference of two sets (subtract the set of commits\r
 reachable from <tt>r1</tt> from the set of commits reachable from\r
 <tt>r2</tt>).</p>\r
@@ -678,8 +678,8 @@ of <tt>r1</tt> and <tt>r2</tt> and is defined as
 It is the set of commits that are reachable from either one of\r
 <tt>r1</tt> or <tt>r2</tt> but not from both.</p>\r
 <p>Two other shorthands for naming a set that is formed by a commit\r
-and its parent commits exists.  <tt>r1^@</tt> notation means all\r
-parents of <tt>r1</tt>.  <tt>r1^!</tt> includes commit <tt>r1</tt> but excludes\r
+and its parent commits exists.  <tt>r1&#94;@</tt> notation means all\r
+parents of <tt>r1</tt>.  <tt>r1&#94;!</tt> includes commit <tt>r1</tt> but excludes\r
 its all parents.</p>\r
 <p>Here are a handful examples:</p>\r
 <div class="literalblock">\r
@@ -709,7 +709,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:29 UTC\r
+Last updated 16-Jun-2007 09:49:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-revert.html b/git-revert.html
index 21df6fba64b13c07a87d9324da7528a3e854634a..288d20a29fa48053ef2930ec5809c583a12fe26e 100644 (file)
--- a/git-revert.html
+++ b/git-revert.html
@@ -345,7 +345,7 @@ effect to your working tree in a row.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:29 UTC\r
+Last updated 16-Jun-2007 09:49:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rm.html b/git-rm.html
index 0096bcecf2d875acc9b3e790c8483f1b3313a19c..728b9531a621a7d32fcb0946bb7ff03172d90bbb 100644 (file)
--- a/git-rm.html
+++ b/git-rm.html
@@ -414,7 +414,7 @@ git-rm -f git-*.sh
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:30 UTC\r
+Last updated 16-Jun-2007 09:49:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-runstatus.html b/git-runstatus.html
index 021a634e3509b9130be281ba560b2aa669de6ae9..1aa5fb3a8637e84362914a3deb417aea068bfd35 100644 (file)
--- a/git-runstatus.html
+++ b/git-runstatus.html
@@ -355,7 +355,7 @@ of git-commit, and later rewritten in C by Jeff King.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:30 UTC\r
+Last updated 16-Jun-2007 09:49:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.html b/git-send-email.html
index c30cba57fc19bf936b58d6456bdd642c6a1abc11..dd8444dd9bf9958e5768efdc5746dbb108717866 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -496,7 +496,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:30 UTC\r
+Last updated 16-Jun-2007 09:49:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-pack.html b/git-send-pack.html
index 9703e3790f6b54c0d6109c34a10cf40857b57b49..377e899f14e2b47dadd8d9e02fd89fa1fa664632 100644 (file)
--- a/git-send-pack.html
+++ b/git-send-pack.html
@@ -443,7 +443,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:31 UTC\r
+Last updated 16-Jun-2007 09:49:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-sh-setup.html b/git-sh-setup.html
index 8a284d228f72ddbfa270c33b61c3de5f066b13b2..2617d869ea3fecfa716386730f664e30eb8fa19f 100644 (file)
--- a/git-sh-setup.html
+++ b/git-sh-setup.html
@@ -364,7 +364,7 @@ require_work_tree
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:31 UTC\r
+Last updated 16-Jun-2007 09:49:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shell.html b/git-shell.html
index 656164af6bf71175d79db7f8f8d935742fd7a688..4dbda062249013445040687d1d7c53fbbe1422fa 100644 (file)
--- a/git-shell.html
+++ b/git-shell.html
@@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:31 UTC\r
+Last updated 16-Jun-2007 09:49:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shortlog.html b/git-shortlog.html
index 4e97c033b21741612c628112f71cb49a852d09dd..77741c27a6ba31c03c6b81045fd1e94bb583d125 100644 (file)
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -344,7 +344,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:32 UTC\r
+Last updated 16-Jun-2007 09:49:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-branch.html b/git-show-branch.html
index f88b6c68f6ef84d418b5e36182dd795e42e59851..3dc5974d1a3a3e32b045b4196518347aaba2c4ed 100644 (file)
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -425,7 +425,7 @@ no &lt;rev&gt; nor &lt;glob&gt; is given on the command line.</p>
         This helps track topic branches by hiding any commit that\r
         is already in the main line of development.  When given\r
         "git show-branch --topics master topic1 topic2", this\r
-        will show the revisions given by "git rev-list ^master\r
+        will show the revisions given by "git rev-list &#94;master\r
         topic1 topic2"\r
 </p>\r
 </dd>\r
@@ -521,7 +521,7 @@ topologically related with each other.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:32 UTC\r
+Last updated 16-Jun-2007 09:49:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-index.html b/git-show-index.html
index e2a2efa3d088b280018a0d92d8f1ca425b18a192..724d3a09c3027b3e0bb4db274e67357baaa7d89c 100644 (file)
--- a/git-show-index.html
+++ b/git-show-index.html
@@ -296,7 +296,7 @@ offset and SHA1 of each object.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:32 UTC\r
+Last updated 16-Jun-2007 09:49:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-ref.html b/git-show-ref.html
index 86f927fd5fea31ce7aad4917c6f455284517cacd..88e9136d8fa7d064c10607396d4a7d473ad849dd 100644 (file)
--- a/git-show-ref.html
+++ b/git-show-ref.html
@@ -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 08-Jun-2007 16:08:32 UTC\r
+Last updated 16-Jun-2007 09:49:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show.html b/git-show.html
index 5f26402cc90ddb172f419eb5820b9295bc497965..97a1de651ed33fc42e1bcd38796e9d5e7385a900 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -739,7 +739,7 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:33 UTC\r
+Last updated 16-Jun-2007 09:49:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ssh-fetch.html b/git-ssh-fetch.html
index 197fae3ddbee18c38718143e22d26a965b8abbfd..7b59e117b9f4578e847f3fbdcd7ffe80e13e1329 100644 (file)
--- a/git-ssh-fetch.html
+++ b/git-ssh-fetch.html
@@ -349,7 +349,7 @@ commit-id
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:33 UTC\r
+Last updated 16-Jun-2007 09:49:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ssh-upload.html b/git-ssh-upload.html
index 75daeaaace364854f155d1eb5652159339341e35..69cbc3a71cb17bc395988414de6758154decc2e0 100644 (file)
--- a/git-ssh-upload.html
+++ b/git-ssh-upload.html
@@ -348,7 +348,7 @@ commit-id
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:33 UTC\r
+Last updated 16-Jun-2007 09:49:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-status.html b/git-status.html
index 0728475e0b25336ffe426a40121b97783a7277b8..924da2f0a2bc7750e3a6afa9394fbbe10b32130b 100644 (file)
--- a/git-status.html
+++ b/git-status.html
@@ -320,7 +320,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:34 UTC\r
+Last updated 16-Jun-2007 09:49:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stripspace.html b/git-stripspace.html
index 6e650adef6aea4b80c991935447dc75fe176f64e..6784f95eb57ba1a719541cdb38197a68b4e74d4d 100644 (file)
--- a/git-stripspace.html
+++ b/git-stripspace.html
@@ -305,7 +305,7 @@ git-stripspace(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:34 UTC\r
+Last updated 16-Jun-2007 09:49:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-submodule.html b/git-submodule.html
index 0e7357c9529b0f9558fd76e954a1a686072c6917..5aef2126075f5f31bf755ec45ab6e3ca81ed343a 100644 (file)
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -363,7 +363,7 @@ to each submodule url is "module.$path.url".</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Jun-2007 16:08:49 UTC\r
+Last updated 16-Jun-2007 09:49:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.html b/git-svn.html
index a06ee4ffb690068c0dda6d9c689bf41b06dc21d7..8c8436e5704aca4cad4caa918f1507f08852e0e2 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -1003,7 +1003,7 @@ should be manually entered with a text-editor or using
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:34 UTC\r
+Last updated 16-Jun-2007 09:49:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svnimport.html b/git-svnimport.html
index fcda155c98232668a5fbfc3a9cbeca82b9cd724a..ced326d65868d00074207dc6e51bbb0c635d6dde 100644 (file)
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -534,7 +534,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:35 UTC\r
+Last updated 16-Jun-2007 09:49:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html
index 46ce27245b81009d31c9c66f3951e10c11ec9d4a..ed437eb600e174e713326d9f827f641b87cb7e8a 100644 (file)
--- a/git-symbolic-ref.html
+++ b/git-symbolic-ref.html
@@ -336,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:35 UTC\r
+Last updated 16-Jun-2007 09:49:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tag.html b/git-tag.html
index e94ddc65a81216005be7c72ad8047082a3566bff..bae2bfde3e6bfd19c24f0e75f0aff97affe61468 100644 (file)
--- a/git-tag.html
+++ b/git-tag.html
@@ -531,7 +531,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:35 UTC\r
+Last updated 16-Jun-2007 09:49:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tar-tree.html b/git-tar-tree.html
index b0ec95ac63168fe62a49a418619d0fb996e65671..3cb53c8c22b2db1b681403886f994c3642549660 100644 (file)
--- a/git-tar-tree.html
+++ b/git-tar-tree.html
@@ -354,7 +354,7 @@ git tar-tree v1.4.0 git-1.4.0 | gzip >git-1.4.0.tar.gz
 </p>\r
 </dd>\r
 <dt>\r
-git tar-tree v1.4.0^{tree} git-1.4.0 | gzip &gt;git-1.4.0.tar.gz\r
+git tar-tree v1.4.0&#94;{tree} git-1.4.0 | gzip &gt;git-1.4.0.tar.gz\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -395,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 08-Jun-2007 16:08:36 UTC\r
+Last updated 16-Jun-2007 09:49:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tools.html b/git-tools.html
index be0bd676b69cc0394452b894ae117d6ca2bf9c90..e68d4dcca0ecfea385d3df20e28f33fbee2869cb 100644 (file)
--- a/git-tools.html
+++ b/git-tools.html
@@ -433,7 +433,7 @@ comprehensive list.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:45 UTC\r
+Last updated 16-Jun-2007 09:49:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-file.html b/git-unpack-file.html
index 4e7075c63bf40fbcfd47206509fa2ef0bd734007..4f4a27f00cf6052ea2d1c4593f520365b953d202 100644 (file)
--- a/git-unpack-file.html
+++ b/git-unpack-file.html
@@ -307,7 +307,7 @@ returns the name of the temporary file in the following format:
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:36 UTC\r
+Last updated 16-Jun-2007 09:49:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index 5a04e6f2e5d384feb02db872764179cf43d2e0f0..3008e346a0d9f27bc914489b6e44bb5e460eadf4 100644 (file)
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -333,7 +333,7 @@ new packs and replace existing ones.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:36 UTC\r
+Last updated 16-Jun-2007 09:49:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-index.html b/git-update-index.html
index f0af8a36b4d90d73e1cd42761378cd91ff0c96b2..b37c1c17827ff47aff6f2ac7c4c9a2c540fa6c93 100644 (file)
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -721,7 +721,7 @@ from symbolic link to regular file.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:37 UTC\r
+Last updated 16-Jun-2007 09:49:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-ref.html b/git-update-ref.html
index f8a8623795b8ae50fd61afbba51d9ca822c97d21..87713c3a8a623d94ba1827be7f85bc61e5f55577 100644 (file)
--- a/git-update-ref.html
+++ b/git-update-ref.html
@@ -360,7 +360,7 @@ or does not have committer information available.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:37 UTC\r
+Last updated 16-Jun-2007 09:49:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-server-info.html b/git-update-server-info.html
index 8db05b647f3c4ff7c57101c59cf07acca53bf519..72749d2486763ba252b839c29f1f0a9717c287b2 100644 (file)
--- a/git-update-server-info.html
+++ b/git-update-server-info.html
@@ -332,7 +332,7 @@ info/refs file unless <tt>--force</tt> flag is given.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:37 UTC\r
+Last updated 16-Jun-2007 09:49:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-upload-archive.html b/git-upload-archive.html
index 35c0203fef44213a1fb505065faae57eb7b99ce2..042496cc9a9a6704096fcbc06437515fa072d455 100644 (file)
--- a/git-upload-archive.html
+++ b/git-upload-archive.html
@@ -309,7 +309,7 @@ is meant to be used to get an archive from a remote repository.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:37 UTC\r
+Last updated 16-Jun-2007 09:49:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-upload-pack.html b/git-upload-pack.html
index 4ce48e3d46806db8ef3665b78c31f5fb02d9a572..e51a3ebc18cc6123507a51a8f5a96d713566621b 100644 (file)
--- a/git-upload-pack.html
+++ b/git-upload-pack.html
@@ -326,7 +326,7 @@ repository.  For push operations, see <em>git-send-pack</em>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:38 UTC\r
+Last updated 16-Jun-2007 09:49:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-var.html b/git-var.html
index 57283f269556aef5633a5fffd9e5cd411cf09855..9c7a87cfdc2451a5b1bcc35bfddb9797316448cf 100644 (file)
--- a/git-var.html
+++ b/git-var.html
@@ -372,7 +372,7 @@ Your sysadmin must hate you!
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:38 UTC\r
+Last updated 16-Jun-2007 09:49:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-verify-pack.html b/git-verify-pack.html
index fc5c942978be3944ed51de1afaefcc50d1d78883..652dd9c9ee19c8bada7e5f807164225b865b689c 100644 (file)
--- a/git-verify-pack.html
+++ b/git-verify-pack.html
@@ -338,7 +338,7 @@ corresponding pack file.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:38 UTC\r
+Last updated 16-Jun-2007 09:49:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-verify-tag.html b/git-verify-tag.html
index 2aea9cf2dfc2a5b4bd487ab55e8d5ee65c17c921..0b78592696773573304db8c6315e378d3db35972 100644 (file)
--- a/git-verify-tag.html
+++ b/git-verify-tag.html
@@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:38 UTC\r
+Last updated 16-Jun-2007 09:49:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-whatchanged.html b/git-whatchanged.html
index 5fceb8c99cb079c766785020a6da680e511ef85b..ac66a68ef4d4a7026478364d7a815bed40574523 100644 (file)
--- a/git-whatchanged.html
+++ b/git-whatchanged.html
@@ -384,7 +384,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:38 UTC\r
+Last updated 16-Jun-2007 09:49:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-write-tree.html b/git-write-tree.html
index 1a37ff11d6579376b7a415d1c94b6ac8982579c0..8f4a0f554c9c890edefc00e50da510a2927b6efa 100644 (file)
--- a/git-write-tree.html
+++ b/git-write-tree.html
@@ -323,7 +323,7 @@ now, you need to have done a <tt>git-update-index</tt> phase before you did the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:39 UTC\r
+Last updated 16-Jun-2007 09:49:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.html b/git.html
index aa8672c8ac4ce0530cc1a5c0ff7028e39cc448b1..502c89c98e563c9c8ec742f9c22022e4a30a9427 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2325,7 +2325,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 09-Jun-2007 20:38:59 UTC\r
+Last updated 16-Jun-2007 09:49:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.html b/gitattributes.html
index b827f9383ca9ac3a333bd56c7129e16079153a9a..59e39e78dc19bd277aeda8de40508e8eb01ca904 100644 (file)
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -658,7 +658,7 @@ frotz   unspecified</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:39 UTC\r
+Last updated 16-Jun-2007 09:49:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitignore.html b/gitignore.html
index 196978c462da1ac92bddbd2eae6df94f09bb48ec..f1e12ba310bed761d774fcf6e65b2d94d05474a4 100644 (file)
--- a/gitignore.html
+++ b/gitignore.html
@@ -403,7 +403,7 @@ Frank Lichtenheld, and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:39 UTC\r
+Last updated 16-Jun-2007 09:49:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitk.html b/gitk.html
index 8c7ecc83d5d360caf6024f57849dbdfb3277c9bd..f26e57ff28158947821db0ae3fe5d9e43377a5e0 100644 (file)
--- a/gitk.html
+++ b/gitk.html
@@ -425,7 +425,7 @@ gitk --max-count=100 --all — Makefile
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:39 UTC\r
+Last updated 16-Jun-2007 09:49:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitmodules.html b/gitmodules.html
new file mode 100644 (file)
index 0000000..9ed61e2
--- /dev/null
+++ b/gitmodules.html
@@ -0,0 +1,344 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+  border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+  margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+  font-style: italic;\r
+}\r
+\r
+strong {\r
+  font-weight: bold;\r
+}\r
+\r
+tt {\r
+  color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  margin-top: 1.2em;\r
+  margin-bottom: 0.5em;\r
+  line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+  border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+  border-bottom: 2px solid silver;\r
+  padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+  font-family: serif;\r
+  margin-left: 0;\r
+}\r
+\r
+hr {\r
+  border: 1px solid silver;\r
+}\r
+\r
+p {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+  padding: 0;\r
+  margin: 0;\r
+}\r
+\r
+span#author {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+  font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+  font-family: sans-serif;\r
+  font-size: small;\r
+  border-top: 2px solid silver;\r
+  padding-top: 0.5em;\r
+  margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+  float: left;\r
+  padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+  float: right;\r
+  padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+  margin-right: 10%;\r
+  margin-top: 1.5em;\r
+  margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+  margin-top: 2.5em;\r
+  margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+  padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  text-align: left;\r
+  margin-top: 1.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+  margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+  margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+  padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+  text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+  vertical-align: top;\r
+  font-size: 1.1em;\r
+  font-weight: bold;\r
+  text-decoration: underline;\r
+  color: #527bbd;\r
+  padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+  padding-left: 0.5em;\r
+  border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+  border-left: 2px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+  white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+dt {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0;\r
+  font-style: italic;\r
+}\r
+dd > *:first-child {\r
+  margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+    list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+  list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+  border-color: #527bbd;\r
+  border-width: 3px;\r
+}\r
+thead {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+}\r
+tfoot {\r
+  font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+  vertical-align: top;\r
+  font-style: italic;\r
+  padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+  vertical-align: top;\r
+}\r
+\r
+@media print {\r
+  div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  margin-top: 0.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+  padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+  border-left: 2px solid silver;\r
+  padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>gitmodules(5)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+gitmodules(5) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>gitmodules -\r
+   defining submodule properties\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p>gitmodules</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>The <tt>.gitmodules</tt> file, located in the top-level directory of a git\r
+working tree, is a text file with a syntax matching the requirements\r
+of <a href="git-config.html">git-config(1)</a>.</p>\r
+<p>The file contains one subsection per submodule, and the subsection value\r
+is the name of the submodule. Each submodule section also contains the\r
+following required keys:</p>\r
+<dl>\r
+<dt>\r
+submodule.&lt;name&gt;.path\r
+</dt>\r
+<dd>\r
+<p>\r
+        Defines the path, relative to the top-level directory of the git\r
+        working tree, where the submodule is expected to be checked out.\r
+        The path name must not end with a <tt>/</tt>. All submodule paths must\r
+        be unique within the .gitmodules file.\r
+</p>\r
+</dd>\r
+<dt>\r
+submodule.&lt;name&gt;.url\r
+</dt>\r
+<dd>\r
+<p>\r
+        Defines an url from where the submodule repository can be cloned.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>EXAMPLES</h2>\r
+<div class="sectionbody">\r
+<p>Consider the following .gitmodules file:</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>[submodule "libfoo"]\r
+        path = include/foo\r
+        url = git://foo.com/git/lib.git</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>[submodule "libbar"]\r
+        path = include/bar\r
+        url = git://bar.com/git/lib.git</tt></pre>\r
+</div></div>\r
+<p>This defines two submodules, <tt>libfoo</tt> and <tt>libbar</tt>. These are expected to\r
+be checked out in the paths <em>include/foo</em> and <em>include/bar</em>, and for both\r
+submodules an url is specified which can be used for cloning the submodules.</p>\r
+</div>\r
+<h2>SEE ALSO</h2>\r
+<div class="sectionbody">\r
+<p><a href="git-submodule.html">git-submodule(1)</a> <a href="git-config.html">git-config(1)</a></p>\r
+</div>\r
+<h2>DOCUMENTATION</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by Lars Hjemli &lt;hjemli@gmail.com&gt;</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 16-Jun-2007 09:49:28 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r

diff --git a/gitmodules.txt b/gitmodules.txt
new file mode 100644 (file)
index 0000000..035294e
--- /dev/null
+++ b/gitmodules.txt
@@ -0,0 +1,62 @@
+gitmodules(5)
+=============
+
+NAME
+----
+gitmodules - defining submodule properties
+
+SYNOPSIS
+--------
+gitmodules
+
+
+DESCRIPTION
+-----------
+
+The `.gitmodules` file, located in the top-level directory of a git
+working tree, is a text file with a syntax matching the requirements
+of gitlink:git-config[1].
+
+The file contains one subsection per submodule, and the subsection value
+is the name of the submodule. Each submodule section also contains the
+following required keys:
+
+submodule.<name>.path::
+       Defines the path, relative to the top-level directory of the git
+       working tree, where the submodule is expected to be checked out.
+       The path name must not end with a `/`. All submodule paths must
+       be unique within the .gitmodules file.
+
+submodule.<name>.url::
+       Defines an url from where the submodule repository can be cloned.
+
+
+EXAMPLES
+--------
+
+Consider the following .gitmodules file:
+
+       [submodule "libfoo"]
+               path = include/foo
+               url = git://foo.com/git/lib.git
+
+       [submodule "libbar"]
+               path = include/bar
+               url = git://bar.com/git/lib.git
+
+
+This defines two submodules, `libfoo` and `libbar`. These are expected to
+be checked out in the paths 'include/foo' and 'include/bar', and for both
+submodules an url is specified which can be used for cloning the submodules.
+
+SEE ALSO
+--------
+gitlink:git-submodule[1] gitlink:git-config[1]
+
+DOCUMENTATION
+-------------
+Documentation by Lars Hjemli <hjemli@gmail.com>
+
+GIT
+---
+Part of the gitlink:git[7] suite

diff --git a/glossary.html b/glossary.html
index ef7ad71d95df54d552856d29ae0390ed9a9b0e99..107ee54edfc61442a1745d10fdd68818c39e49f7 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -1069,7 +1069,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:45 UTC\r
+Last updated 16-Jun-2007 09:49:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/hooks.html b/hooks.html
index 62f06e1cf1eb0d55012de56310ba982dfe91ad7c..2879252d231202c6a2a190a2783701a593e73679 100644 (file)
--- a/hooks.html
+++ b/hooks.html
@@ -456,7 +456,7 @@ for the user.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:44 UTC\r
+Last updated 16-Jun-2007 09:49:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/howto-index.html b/howto-index.html
index d0119cb75c1d464e2201b90a472dbff681097470..e351f21bf7512faae73984d32210d76a565103f4 100644 (file)
--- a/howto-index.html
+++ b/howto-index.html
@@ -341,7 +341,7 @@ into which branch and who can make a tag.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:44 UTC\r
+Last updated 16-Jun-2007 09:49:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 5ccd281eef9190beef22f513884fc0f8197ae7f9..09859e867f251e522de4ad9b1c02cde6015a0f48 100644 (file)
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -434,7 +434,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:45 UTC\r
+Last updated 16-Jun-2007 09:49:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/repository-layout.html b/repository-layout.html
index c042db02814d79190f270a86e64f1045501e60d8..f0bb79a4c46368963ce01e5d0168b437274f5245 100644 (file)
--- a/repository-layout.html
+++ b/repository-layout.html
@@ -582,7 +582,7 @@ shallow
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:44 UTC\r
+Last updated 16-Jun-2007 09:49:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial-2.html b/tutorial-2.html
index 8f14b97d6c89baa7296ee7deb03e6ec3d09fa431..cfff83547f7128c38152cb4e83c1a3a41bef885b 100644 (file)
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -647,7 +647,7 @@ example, creating a new commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2007 16:08:41 UTC\r
+Last updated 16-Jun-2007 09:49:29 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial.html b/tutorial.html
index f3d84d4d674f32c6a659f3886c97297356315a3a..3fdd03827a3efbc3995b8f59e3f04748b06a242c 100644 (file)
--- a/tutorial.html
+++ b/tutorial.html
@@ -786,7 +786,7 @@ digressions that may be interesting at this point are:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Jun-2007 01:21:27 UTC\r
+Last updated 16-Jun-2007 09:49:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/user-manual.txt b/user-manual.txt
index 0bfa21b3d2eddf2783890d880e3d5abc951b62fa..ff7c71d4fb73932dd0925cf9dd19c74544f68055 100644 (file)
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -2757,8 +2757,8 @@ As a result, the general consistency of an object can always be tested
 independently of the contents or the type of the object: all objects can
 be validated by verifying that (a) their hashes match the content of the
 file and (b) the object successfully inflates to a stream of bytes that
-forms a sequence of <ascii type without space> + <space> + <ascii decimal
-size> + <byte\0> + <binary object data>.
+forms a sequence of <ascii type without space> {plus} <space> {plus} <ascii decimal
+size> {plus} <byte\0> {plus} <binary object data>.
 
 The structured objects can further have their structure and
 connectivity to other objects verified. This is generally done with