summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2016-10-19 20:42:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-19 21:58:53 (GMT)
commit15ef78008aa6cdd42dbef3b1bd00ae64e4ab731a (patch)
tree8a1263c82e856f8c201a9c9ac817a80ada4cf444 /Documentation/gitmodules.txt
parent4d7bc52b178bffe9e484c4dcd92d5353e2ce716f (diff)
downloadgit-15ef78008aa6cdd42dbef3b1bd00ae64e4ab731a.zip
git-15ef78008aa6cdd42dbef3b1bd00ae64e4ab731a.tar.gz
git-15ef78008aa6cdd42dbef3b1bd00ae64e4ab731a.tar.bz2
submodules doc: update documentation for "." used for submodule branches
4d7bc52b17 ("submodule update: allow '.' for branch value", 2016-08-03) adopted from Gerrit a feature to set "." as a special value of "submodule.<name>.branch" in .gitmodules file to indicate that the tracking branch in the submodule should be the same as the current branch in the superproject. Update the documentation to describe this. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 07cdd73..5f50df4 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