summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2014-03-27 14:06:20 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-27 14:58:37 -0700
commit15d64936d4be1e11085e21de6615742298276ab6 (patch)
tree895175ad0098cfa88d2a0a251b51104fa4f3b88c
parentb928922727d6691a3bdc28160f93f25712c565f6 (diff)
downloadgit-wt/doc-submodule-name-path-confusion-1.tar.gz
doc: submodule.* config are keyed by submodule nameswt/doc-submodule-name-path-confusion-1
Ever since 941987a5 (git-submodule: give submodules proper names, 2007-06-11) introduced the ability to move a submodule from one path to another inside its superproject tree without losing its identity, we should have consistently used submodule.<name>.* to access settings related to the named submodule. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-submodule.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index b1996f1a63..77e45d1060 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -208,7 +208,7 @@ OPTIONS
-b::
--branch::
Branch of repository to add as submodule.
- The name of the branch is recorded as `submodule.<path>.branch` in
+ The name of the branch is recorded as `submodule.<name>.branch` in
`.gitmodules` for `update --remote`.
-f::