summaryrefslogtreecommitdiffstats
path: root/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
commitabad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 (patch)
tree85e1e4b4fcd9b473ecbe709db2d9262dc57ad21d /gitmodules.txt
parent085534867cb82e0690945a1645554999bcfa542a (diff)
downloadgit-htmldocs-abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0.tar.gz
Autogenerated HTML docs for v1.8.1-151-g32238a
Diffstat (limited to 'gitmodules.txt')
-rw-r--r--gitmodules.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/gitmodules.txt b/gitmodules.txt
index ab3e91c05..52d7ae431 100644
--- a/gitmodules.txt
+++ b/gitmodules.txt
@@ -49,6 +49,11 @@ submodule.<name>.update::
This config option is overridden if 'git submodule update' is given
the '--merge', '--rebase' or '--checkout' options.
+submodule.<name>.branch::
+ A remote branch name for tracking updates in the upstream submodule.
+ If the option is not specified, it defaults to 'master'. See the
+ `--remote` documentation in linkgit:git-submodule[1] for details.
+
submodule.<name>.fetchRecurseSubmodules::
This option can be used to control recursive fetching of this
submodule. If this option is also present in the submodules entry in