From: Junio C Hamano Date: Thu, 16 Aug 2007 04:59:27 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc5-11-g312e X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b178be477d5f20850528f5232064ee7d1ec484c;p=git.git 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 index 000000000..e8281c72a --- /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 " 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 5618279db..a26adc3f7 100644 --- a/git-apply.html +++ b/git-apply.html @@ -570,6 +570,19 @@ apply.whitespace +

Submodules

+
+

If the patch contains any changes to submodules then 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

Written by Linus Torvalds <torvalds@osdl.org>

@@ -584,7 +597,7 @@ apply.whitespace
diff --git a/git-apply.txt b/git-apply.txt index f03f66165..4c7e3a2f7 100644 --- 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 169487ab4..421eae775 100644 --- a/git.html +++ b/git.html @@ -2429,7 +2429,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 18f8b6a0a..8017997fb 100644 --- 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],