diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:31:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:31:16 -0700 |
| commit | 00d4ff1a69883e24b095f45251d99143b5bc0320 (patch) | |
| tree | fbb49062287319079cbe77b3abafc78d0603253b | |
| parent | d3badc6eb0961382788c2670129d5ee133d079fd (diff) | |
| parent | 7c15fe92acf267f7538d8f4bece33d6bc8409cd7 (diff) | |
| download | git-00d4ff1a69883e24b095f45251d99143b5bc0320.tar.gz | |
Merge branch 'wt/doc-submodule-name-path-confusion-2'
* wt/doc-submodule-name-path-confusion-2:
doc: submodule.*.branch config is keyed by name
| -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 a15d92d09b..77588b0dd8 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 |