Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'wt/doc-submodule-name-path-confusion-2'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Mar 2014 23:31:16 +0000
(16:31 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Mar 2014 23:31:16 +0000
(16:31 -0700)
* wt/doc-submodule-name-path-confusion-2:
doc: submodule.*.branch config is keyed by name
Documentation/git-submodule.txt
patch
|
blob
|
history
raw
(from parent 1:
d3badc6
)
diff --git
a/Documentation/git-submodule.txt
b/Documentation/git-submodule.txt
index a15d92d09bbd12aa553bbafa3d7f40e17504b09f..77588b0dd8f94a20e1be4b6ab464e898bb336439 100644
(file)
--- 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