diff options
| author | W. Trevor King <wking@tremily.us> | 2014-03-27 22:06:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-27 23:01:42 +0100 |
| commit | 7c15fe92acf267f7538d8f4bece33d6bc8409cd7 (patch) | |
| tree | 6a212835af732f02517ef8c828954f242a82f53f /Documentation/git-submodule.txt | |
| parent | submodule: explicit local branch creation in module_clone (diff) | |
| download | git-7c15fe92acf267f7538d8f4bece33d6bc8409cd7.tar.xz git-7c15fe92acf267f7538d8f4bece33d6bc8409cd7.zip | |
doc: submodule.*.branch config is keyed by name
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.
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-submodule.txt')
| -rw-r--r-- | Documentation/git-submodule.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 2e1c7a28d0..a7597bf225 100644 --- 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 |