diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:29:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:29:02 -0700 |
| commit | 0ef576d30888bb16158a9810aea3b7841396474d (patch) | |
| tree | 4247ba81d789410055aec66b03aeea8a20eef7ad /Documentation/gitmodules.txt | |
| parent | The tenth batch of topics (diff) | |
| parent | Git 1.7.10.2 (diff) | |
| download | tgif-0ef576d30888bb16158a9810aea3b7841396474d.tar.xz | |
Sync with 1.7.10.2
Diffstat (limited to 'Documentation/gitmodules.txt')
| -rw-r--r-- | Documentation/gitmodules.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 4e1fd52e7d..4effd78902 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -41,8 +41,11 @@ submodule.<name>.update:: the commit specified in the superproject. If 'merge', the commit specified in the superproject will be merged into the current branch in the submodule. + If 'none', the submodule with name `$name` will not be updated + by default. + This config option is overridden if 'git submodule update' is given - the '--merge' or '--rebase' options. + the '--merge', '--rebase' or '--checkout' options. submodule.<name>.fetchRecurseSubmodules:: This option can be used to control recursive fetching of this |