summaryrefslogtreecommitdiffstats
path: root/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-06 14:24:17 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-06 14:24:17 -0800
commit9906f1f2277410d5f7fedc74ded20e8490812568 (patch)
treecb0065c72cfc6ffab57967b6f38c4a02683fb111 /gitmodules.txt
parentb1acf0200aa1efd66d18ed4e108792e1068464a9 (diff)
downloadgit-htmldocs-9906f1f2277410d5f7fedc74ded20e8490812568.tar.gz
Autogenerated HTML docs for v1.8.5.2-233-g932f
Diffstat (limited to 'gitmodules.txt')
-rw-r--r--gitmodules.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitmodules.txt b/gitmodules.txt
index f7be93f63..347a9f76e 100644
--- a/gitmodules.txt
+++ b/gitmodules.txt
@@ -35,6 +35,8 @@ submodule.<name>.url::
linkgit:git-clone[1] or (if it begins with ./ or ../) a location
relative to the superproject's origin repository.
+In addition, there are a number of optional keys:
+
submodule.<name>.update::
Defines what to do when the submodule is updated by the superproject.
If 'checkout' (the default), the new commit specified in the