summaryrefslogtreecommitdiff
path: root/Documentation/git-submodule.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-31 16:31:13 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 16:31:14 -0700
commitd3badc6eb0961382788c2670129d5ee133d079fd (patch)
treeb3dfd39bdb1cfe0405605ae48cc23def3979977d /Documentation/git-submodule.txt
parent8456113de56a1d1407703b1d4d8e789a54b987c9 (diff)
parent15d64936d4be1e11085e21de6615742298276ab6 (diff)
downloadgit-d3badc6eb0961382788c2670129d5ee133d079fd.tar.gz
Merge branch 'wt/doc-submodule-name-path-confusion-1'
* wt/doc-submodule-name-path-confusion-1: doc: submodule.* config are keyed by submodule names
Diffstat (limited to 'Documentation/git-submodule.txt')
-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 46c1eebb93..a15d92d09b 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -247,7 +247,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::