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.txt | |
| parent | f7b9ebd595c954cd0803e6b6f1f0f96a966e04c9 (diff) | |
| download | git-htmldocs-3b178be477d5f20850528f5232064ee7d1ec484c.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc5-11-g312e
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 14 |
1 files changed, 14 insertions, 0 deletions
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 ------ |