Autogenerated HTML docs for v1.5.3-rc5-11-g312e

diff --git a/RelNotes-1.5.2.5.txt b/RelNotes-1.5.2.5.txt
new file mode 100644 (file)
index 0000000..e8281c7
--- /dev/null
+++ b/RelNotes-1.5.2.5.txt
@@ -0,0 +1,30 @@
+GIT v1.5.2.5 Release Notes
+==========================
+
+Fixes since v1.5.2.4
+--------------------
+
+ * Bugfixes
+
+   - "git add -u" had a serious data corruption problem in one
+     special case (when the changes to a subdirectory's files
+     consist only deletion of files).
+
+   - "git add -u <path>" did not work from a subdirectory.
+
+   - "git apply" left an empty directory after all its files are
+     renamed away.
+
+   - "git $anycmd foo/bar", when there is a file 'foo' in the
+     working tree, complained that "git $anycmd foo/bar --" form
+     should be used to disambiguate between revs and files,
+     which was completely bogus.
+
+   - "git checkout-index" and other commands that checks out
+     files to the work tree tried unlink(2) on directories,
+     which is a sane thing to do on sane systems, but not on
+     Solaris when you are root.
+
+ * Documentation Fixes and Updates
+
+   - A handful documentation fixes.

diff --git a/git-apply.html b/git-apply.html
index 5618279db3bb3a66a81bc9017fe934fb6097ffa5..a26adc3f7c15737325d50e1f4f17cff5de508e5f 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -570,6 +570,19 @@ apply.whitespace
 </dd>\r
 </dl>\r
 </div>\r
+<h2>Submodules</h2>\r
+<div class="sectionbody">\r
+<p>If the patch contains any changes to submodules then <a href="git-apply.html">git-apply(1)</a>\r
+treats these changes as follows.</p>\r
+<p>If --index is specified (explicitly or implicitly), then the submodule\r
+commits must match the index exactly for the patch to apply.  If any\r
+of the submodules are checked-out, then these check-outs are completely\r
+ignored, i.e., they are not required to be up-to-date or clean and they\r
+are not updated.</p>\r
+<p>If --index is not specified, then the submodule commits in the patch\r
+are ignored and only the absence of presence of the corresponding\r
+subdirectory is checked and (if possible) updated.</p>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>\r
@@ -584,7 +597,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:31 UTC\r
+Last updated 16-Aug-2007 04:58:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index f03f661652814d0900f3564c1914b217dc465a01..4c7e3a2f7f5d542cd95059430f53143bba59fc7f 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -171,6 +171,20 @@ apply.whitespace::
        When no `--whitespace` flag is given from the command
        line, this configuration item is used as the default.
 
+Submodules
+----------
+If the patch contains any changes to submodules then gitlink:git-apply[1]
+treats these changes as follows.
+
+If --index is specified (explicitly or implicitly), then the submodule
+commits must match the index exactly for the patch to apply.  If any
+of the submodules are checked-out, then these check-outs are completely
+ignored, i.e., they are not required to be up-to-date or clean and they
+are not updated.
+
+If --index is not specified, then the submodule commits in the patch
+are ignored and only the absence of presence of the corresponding
+subdirectory is checked and (if possible) updated.
 
 Author
 ------

diff --git a/git.html b/git.html
index 169487ab41e0c9b32b4856ee0e174adf98a9bfff..421eae775f509e3bdef98221f0b243c26563fa02 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2429,7 +2429,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 11-Aug-2007 08:29:16 UTC\r
+Last updated 16-Aug-2007 04:58:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 18f8b6a0a10c2f724e623ba95d0aa17bf9b6d686..8017997fb9bd38a0c497bf233a8f0908b33f8329 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -42,9 +42,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.5.2.4/git.html[documentation for release 1.5.2.4]
+* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
 
 * release notes for
+  link:RelNotes-1.5.2.5.txt[1.5.2.5],
   link:RelNotes-1.5.2.4.txt[1.5.2.4],
   link:RelNotes-1.5.2.3.txt[1.5.2.3],
   link:RelNotes-1.5.2.2.txt[1.5.2.2],