Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'"
author
Junio C Hamano
<gitster@pobox.com>
Tue, 1 Apr 2014 18:52:37 +0000
(11:52 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 1 Apr 2014 18:52:37 +0000
(11:52 -0700)
This reverts commit
00d4ff1a69883e24b095f45251d99143b5bc0320
, reversing
changes made to
d3badc6eb0961382788c2670129d5ee133d079fd
.
Documentation/git-submodule.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(from parent 1:
25d1ac0
)
diff --git
a/Documentation/git-submodule.txt
b/Documentation/git-submodule.txt
index 77588b0dd8f94a20e1be4b6ab464e898bb336439..a15d92d09bbd12aa553bbafa3d7f40e17504b09f 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.<
name
>.branch`.
+submodules with a local branch named after `submodule.<
path
>.branch`.
+
For updates that do not clone missing submodules, the submodule's HEAD
is only touched when the remote reference does not match the