diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-01 11:52:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-01 11:52:37 -0700 |
| commit | edac360bdd35eacfb11005583aa7736d72a063bd (patch) | |
| tree | f3f04509d2765042a08b08d157b0185546a85852 | |
| parent | 25d1ac0e59f4471c3b124a0c19cad9f9511a26ad (diff) | |
| download | git-edac360bdd35eacfb11005583aa7736d72a063bd.tar.gz | |
Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'"
This reverts commit 00d4ff1a69883e24b095f45251d99143b5bc0320, reversing
changes made to d3badc6eb0961382788c2670129d5ee133d079fd.
| -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 77588b0dd8..a15d92d09b 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.<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 |