Skip to content

Commit

Permalink
Merge branch 'bw/submodule-branch-dot-doc' into maint
Browse files Browse the repository at this point in the history
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 c838696
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Documentation/git-submodule.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
7 changes: 5 additions & 2 deletions Documentation/gitmodules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c838696

Please sign in to comment.