path: root/Documentation/git-apply.txt
diff options
authorSven Verdoolaege <>2007-08-15 17:22:09 (GMT)
committerJunio C Hamano <>2007-08-16 04:39:07 (GMT)
commite06c5a6c7bdaa8c96b72e29f7fb49a331f1e0cc2 (patch)
tree0e2bd1bc594b9f1b8787bdd6b7a8f18b770ada4f /Documentation/git-apply.txt
parentda899deb24ff66ec2166389516a915c01bf0a387 (diff)
git-apply: apply submodule changes
Apply "Subproject commit HEX" changes produced by git-diff. As usual in the current git, only the superproject itself is actually modified (possibly creating empty directories for new submodules). Any checked-out submodule is left untouched and is not required to be up-to-date. With clean-ups from Junio C Hamano. Signed-off-by: Sven Verdoolaege <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-apply.txt')
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index f03f661..4c7e3a2 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/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.
+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.