summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-26 20:14:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-26 20:14:49 (GMT)
commit7425fe100fc90b492549f51aa60ac1e70e7f4c9a (patch)
treea8b9c85dcdd248d34b87afc18eb43335a1166108 /Documentation/gitmodules.txt
parent9b009ce6011d64ca816196827ea1ac43f5cb5fe3 (diff)
parent15ef78008aa6cdd42dbef3b1bd00ae64e4ab731a (diff)
downloadgit-7425fe100fc90b492549f51aa60ac1e70e7f4c9a.zip
git-7425fe100fc90b492549f51aa60ac1e70e7f4c9a.tar.gz
git-7425fe100fc90b492549f51aa60ac1e70e7f4c9a.tar.bz2
Merge branch 'bw/submodule-branch-dot-doc'
Recent git allows submodule.<name>.branch to use a special token "." instead of the branch name; the documentation has been updated to describe it. * bw/submodule-branch-dot-doc: submodules doc: update documentation for "." used for submodule branches
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r--Documentation/gitmodules.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 10dcc08..8f7c50f 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -50,8 +50,11 @@ submodule.<name>.update::
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.
+ If the option is not specified, it defaults to 'master'. A special
+ value of `.` is used to indicate that the name of the branch in the
+ submodule should be the same name as the current branch in the
+ current repository. 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