diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:47 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:47 +0900 |
| commit | 90d228b0d702d105dc2738f49528deb5fdb0e201 (patch) | |
| tree | 2db5de796cb521f76736ce5a736a1afcd33c2698 /Documentation/gitsubmodules.txt | |
| parent | Merge branch 'ds/reachable' (diff) | |
| parent | doc: fix formatting in git-update-ref (diff) | |
| download | tgif-90d228b0d702d105dc2738f49528deb5fdb0e201.tar.xz | |
Merge branch 'ah/doc-updates'
Doc updates.
* ah/doc-updates:
doc: fix formatting in git-update-ref
doc: fix indentation of listing blocks in gitweb.conf.txt
doc: fix descripion for 'git tag --format'
doc: fix inappropriate monospace formatting
doc: fix ASCII art tab spacing
doc: clarify boundaries of 'git worktree list --porcelain'
Diffstat (limited to 'Documentation/gitsubmodules.txt')
| -rw-r--r-- | Documentation/gitsubmodules.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt index 504c5f1a88..57999e9f36 100644 --- a/Documentation/gitsubmodules.txt +++ b/Documentation/gitsubmodules.txt @@ -169,11 +169,15 @@ ACTIVE SUBMODULES A submodule is considered active, - (a) if `submodule.<name>.active` is set to `true` - or - (b) if the submodule's path matches the pathspec in `submodule.active` - or - (c) if `submodule.<name>.url` is set. + a. if `submodule.<name>.active` is set to `true` ++ +or + + b. if the submodule's path matches the pathspec in `submodule.active` ++ +or + + c. if `submodule.<name>.url` is set. and these are evaluated in this order. |