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

gitster · gitster · commit 00d4ff1a6988 · 2014-03-31T16:31:16.000-07:00
* wt/doc-submodule-name-path-confusion-2:
  doc: submodule.*.branch config is keyed by name
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
@@ -162,7 +162,7 @@ update::
 +
 For updates that clone missing submodules, checkout-mode updates will
 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
 is only touched when the remote reference does not match the

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