Autogenerated manpages for v1.5.3-rc5-11-g312e

diff --git a/man1/git-apply.1 b/man1/git-apply.1
index 1951a6898819a4b1fb0ca745ef132ce3f9d9fd37..4c7557f589f04cb443d38e8133d83f77c43eab22 100644 (file)
--- a/man1/git-apply.1
+++ b/man1/git-apply.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-APPLY" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-APPLY" "1" "08/16/2007" "Git 1.5.3.rc5.11.g312e" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -108,6 +108,12 @@ Report progress to stderr. By default, only a message about the current patch be
 .TP
 apply.whitespace
 When no \-\-whitespace flag is given from the command line, this configuration item is used as the default.
+.SH "SUBMODULES"
+If the patch contains any changes to submodules then \fBgit\-apply\fR(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.
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org>
 .SH "DOCUMENTATION"

diff --git a/man7/git.7 b/man7/git.7
index 965b0925bb3f5d40e61e59c0cde69b4f54d5b1db..b752595438b4307a024e5f4196bcb1b07626ed2d 100644 (file)
--- a/man7/git.7
+++ b/man7/git.7
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT" "7" "08/11/2007" "Git 1.5.3.rc4.67.gf9286" "Git Manual"
+.TH "GIT" "7" "08/16/2007" "Git 1.5.3.rc5.11.g312e" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)