diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-08-16 04:59:27 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-08-16 04:59:27 +0000 |
| commit | 3b178be477d5f20850528f5232064ee7d1ec484c (patch) | |
| tree | 30809f6066257811fc7a6264679b29150ee04acf /git-apply.html | |
| parent | f7b9ebd595c954cd0803e6b6f1f0f96a966e04c9 (diff) | |
| download | git-htmldocs-3b178be477d5f20850528f5232064ee7d1ec484c.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc5-11-g312e
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 15 |
1 files changed, 14 insertions, 1 deletions
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 </dd>
</dl>
</div>
+<h2>Submodules</h2>
+<div class="sectionbody">
+<p>If the patch contains any changes to submodules then <a href="git-apply.html">git-apply(1)</a>
+treats these changes as follows.</p>
+<p>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.</p>
+<p>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.</p>
+</div>
<h2>Author</h2>
<div class="sectionbody">
<p>Written by Linus Torvalds <torvalds@osdl.org></p>
@@ -584,7 +597,7 @@ apply.whitespace </div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jul-2007 02:09:31 UTC
+Last updated 16-Aug-2007 04:58:55 UTC
</div>
</div>
</body>
|