summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-29 13:22:33 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-29 13:22:33 +0900
commitef75f377a0a3170ce7d5664cab4a6057d91f59c8 (patch)
tree53d653ca9e3e30c8bc07e31691a4b3f640caf100 /config.txt
parentf088858b7d9cf7778d88910914cf7c34d0fdeb83 (diff)
downloadgit-htmldocs-ef75f377a0a3170ce7d5664cab4a6057d91f59c8.tar.gz
Autogenerated HTML docs for v2.14.2-666-gea220
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/config.txt b/config.txt
index dc4e3f58a..1ac0ae6ad 100644
--- a/config.txt
+++ b/config.txt
@@ -3085,10 +3085,14 @@ submodule.<name>.url::
See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
submodule.<name>.update::
- The default update procedure for a submodule. This variable
- is populated by `git submodule init` from the
- linkgit:gitmodules[5] file. See description of 'update'
- command in linkgit:git-submodule[1].
+ The method by which a submodule is updated by 'git submodule update',
+ which is the only affected command, others such as
+ 'git checkout --recurse-submodules' are unaffected. It exists for
+ historical reasons, when 'git submodule' was the only command to
+ interact with submodules; settings like `submodule.active`
+ and `pull.rebase` are more specific. It is populated by
+ `git submodule init` from the linkgit:gitmodules[5] file.
+ See description of 'update' command in linkgit:git-submodule[1].
submodule.<name>.branch::
The remote branch name for a submodule, used by `git submodule