Merge branch 'wt/doc-submodule-name-path-confusion-2'

* wt/doc-submodule-name-path-confusion-2:
  doc: submodule.*.branch config is keyed by name
This commit is contained in:
Junio C Hamano 2014-03-31 16:31:16 -07:00
commit 00d4ff1a69

View File

@ -162,7 +162,7 @@ update::
+ +
For updates that clone missing submodules, checkout-mode updates will For updates that clone missing submodules, checkout-mode updates will
create submodules with detached HEADs; all other modes will create create submodules with detached HEADs; all other modes will create
submodules with a local branch named after `submodule.<path>.branch`. submodules with a local branch named after `submodule.<name>.branch`.
+ +
For updates that do not clone missing submodules, the submodule's HEAD For updates that do not clone missing submodules, the submodule's HEAD
is only touched when the remote reference does not match the is only touched when the remote reference does not match the