summaryrefslogtreecommitdiffstats
path: root/git-submodule.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-31 17:26:48 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 17:26:48 -0700
commit52b6ba3e7e1bc9132a7f756c6a968b1214549fb8 (patch)
tree1f17a005fc91393e650e7207c66a18205e333ea1 /git-submodule.txt
parentc2a58767a86a1f96c6f53594d457b30abe184655 (diff)
downloadgit-htmldocs-52b6ba3e7e1bc9132a7f756c6a968b1214549fb8.tar.gz
Autogenerated HTML docs for v1.9.1-429-g25d1a
Diffstat (limited to 'git-submodule.txt')
-rw-r--r--git-submodule.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-submodule.txt b/git-submodule.txt
index 46c1eebb9..77588b0dd 100644
--- a/git-submodule.txt
+++ b/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
@@ -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::