summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-02 14:15:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-02 14:15:36 -0700
commitd851ffb91f8c25f51b284cd4e849757d656de0d1 (patch)
treeaae922c6fa4df1621177805814815b59c95c101e /Documentation/gitmodules.txt
parentRevert "Merge branch 'wt/doc-submodule-name-path-confusion-2'" (diff)
downloadtgif-d851ffb91f8c25f51b284cd4e849757d656de0d1.tar.xz
Revert "submodule: explicit local branch creation in module_clone"
This reverts commit 23d25e48f5ead73c9ce233986f90791abec9f1e8, as it is broken for users who haven't opted into the new feature of checking out submodule.*.branch with update mode set to checkout.
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r--Documentation/gitmodules.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index f539e3f66a..347a9f76ee 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -55,10 +55,6 @@ 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