Skip to content
Permalink
Browse files

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
  • Loading branch information...
gitster committed Oct 28, 2016
2 parents 63cf124 + 15ef780 commit c8386962d6590ec6f71f353bc5b1b573b1e71b16
Showing with 8 additions and 3 deletions.
  1. +3 −1 Documentation/git-submodule.txt
  2. +5 −2 Documentation/gitmodules.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::
@@ -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

0 comments on commit c838696

Please sign in to comment.
You can’t perform that action at this time.