diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-11 13:03:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 13:03:49 -0700 |
| commit | 4fdb4d62582a2e9f84d197c3273f3279a0716b93 (patch) | |
| tree | e8eeca3156c8e426c44c1bf5f5e1791c50aa146e /gitmodules.txt | |
| parent | bcdb12ed43f108ca2931dda48a9b772cd4efb5f5 (diff) | |
| download | git-htmldocs-4fdb4d62582a2e9f84d197c3273f3279a0716b93.tar.gz | |
Autogenerated HTML docs for v1.7.10.2-484-gcd07c
Diffstat (limited to 'gitmodules.txt')
| -rw-r--r-- | gitmodules.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gitmodules.txt b/gitmodules.txt index 4e1fd52e7..4effd7890 100644 --- a/gitmodules.txt +++ b/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 |