mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'es/doc-gitsubmodules-markup'

Browse Source 
Doc markup fix.

* es/doc-gitsubmodules-markup:
  gitsubmodules: align html and nroff lists
This commit is contained in:
Junio C Hamano
2019-05-30 10:50:46 -07:00
parent 936dce6f93 8e9fe16c87
commit c41b1197ec
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/gitsubmodules.txt
View File

@ -169,15 +169,15 @@ ACTIVE SUBMODULES
A submodule is considered active, A submodule is considered active,
a. if `submodule.<name>.active` is set to `true` 1. if `submodule.<name>.active` is set to `true`
+ +
or or
b. if the submodule's path matches the pathspec in `submodule.active` 2. if the submodule's path matches the pathspec in `submodule.active`
+ +
or or
c. if `submodule.<name>.url` is set. 3. if `submodule.<name>.url` is set.
and these are evaluated in this order. and these are evaluated in this order.
@ -193,11 +193,11 @@ For example:
url = https://example.org/baz url = https://example.org/baz
In the above config only the submodule 'bar' and 'baz' are active, In the above config only the submodule 'bar' and 'baz' are active,
'bar' due to (a) and 'baz' due to (c). 'foo' is inactive because 'bar' due to (1) and 'baz' due to (3). 'foo' is inactive because
(a) takes precedence over (c) (1) takes precedence over (3)
Note that (c) is a historical artefact and will be ignored if the Note that (3) is a historical artefact and will be ignored if the
(a) and (b) specify that the submodule is not active. In other words, (1) and (2) specify that the submodule is not active. In other words,
if we have a `submodule.<name>.active` set to `false` or if the if we have a `submodule.<name>.active` set to `false` or if the
submodule's path is excluded in the pathspec in `submodule.active`, the submodule's path is excluded in the pathspec in `submodule.active`, the
url doesn't matter whether it is present or not. This is illustrated in url doesn't matter whether it is present or not. This is illustrated in