diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:49 -0700 |
| commit | 7425fe100fc90b492549f51aa60ac1e70e7f4c9a (patch) | |
| tree | a8b9c85dcdd248d34b87afc18eb43335a1166108 /Documentation/gitmodules.txt | |
| parent | 9b009ce6011d64ca816196827ea1ac43f5cb5fe3 (diff) | |
| parent | 15ef78008aa6cdd42dbef3b1bd00ae64e4ab731a (diff) | |
| download | git-7425fe100fc90b492549f51aa60ac1e70e7f4c9a.tar.gz | |
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.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 10dcc08ff9..8f7c50f330 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 |