mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
7425fe100f
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue