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

* wt/doc-submodule-name-path-confusion-2: doc: submodule.*.branch config is keyed by name
git-mirror · Mar 31, 2014 · 00d4ff1 · 00d4ff1
2 parents d3badc6 + 7c15fe9
commit 00d4ff1
Showing 1 changed file with 1 addition and 1 deletion.
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