diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:19 -0700 |
| commit | c8386962d6590ec6f71f353bc5b1b573b1e71b16 (patch) | |
| tree | 5e3b5b0c5b9cc7cd1f6256dd80f041bb21b624a1 /Documentation | |
| parent | 63cf124c2436722d70c28fc12f9337e9938091ef (diff) | |
| parent | 15ef78008aa6cdd42dbef3b1bd00ae64e4ab731a (diff) | |
| download | git-c8386962d6590ec6f71f353bc5b1b573b1e71b16.tar.gz git-c8386962d6590ec6f71f353bc5b1b573b1e71b16.tar.xz | |
Merge branch 'bw/submodule-branch-dot-doc' into maint
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')
| -rw-r--r-- | Documentation/git-submodule.txt | 4 | ||||
| -rw-r--r-- | Documentation/gitmodules.txt | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index bf3bb372e..d84157347 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -259,7 +259,9 @@ OPTIONS --branch:: Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in - `.gitmodules` for `update --remote`. + `.gitmodules` for `update --remote`. 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. -f:: --force:: diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 10dcc08ff..8f7c50f33 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 |