diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:33 -0800 |
| commit | 06c27689ddba0235ef4544cd4b2763c2572f9715 (patch) | |
| tree | b5f8f0c43d061fd95a74a0dc63c1898b1d4716b9 /Documentation/gitmodules.txt | |
| parent | 043478308feec3cda9b3473bc0b79396cb9d4db6 (diff) | |
| parent | 9937e65d8835ee6c026892de48f993d7a524a00f (diff) | |
| download | git-06c27689ddba0235ef4544cd4b2763c2572f9715.tar.gz | |
Merge branch 'wk/submodule-on-branch'
Make sure 'submodule update' modes that do not detach HEADs can
be used more pleasantly by checking out a concrete branch when
cloning them to prime the well.
* wk/submodule-on-branch:
Documentation: describe 'submodule update --remote' use case
submodule: explicit local branch creation in module_clone
submodule: document module_clone arguments in comments
submodule: make 'checkout' update_module mode more explicit
Diffstat (limited to 'Documentation/gitmodules.txt')
| -rw-r--r-- | Documentation/gitmodules.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 347a9f76ee..f539e3f66a 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -55,6 +55,10 @@ 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. ++ +This branch name is also used for the local branch created by +non-checkout cloning updates. See the `update` documentation in +linkgit:git-submodule[1] for details. submodule.<name>.fetchRecurseSubmodules:: This option can be used to control recursive fetching of this |