summaryrefslogtreecommitdiffstats
path: root/gitsubmodules.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-30 11:17:47 -0700
committerJunio C Hamano <gitster@pobox.com>2019-05-30 11:17:47 -0700
commitc01eecf936b3fc58968e889f0c1e7ab7340df593 (patch)
treedcf6c9920dfcc4ba892021391755631a78fefcb7 /gitsubmodules.html
parent56d696ee5be4d6ce871726df6e396c76eedcccf0 (diff)
downloadgit-htmldocs-c01eecf936b3fc58968e889f0c1e7ab7340df593.tar.gz
Autogenerated HTML docs for v2.22.0-rc2
Diffstat (limited to 'gitsubmodules.html')
-rw-r--r--gitsubmodules.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/gitsubmodules.html b/gitsubmodules.html
index 255365630..bbccfd974 100644
--- a/gitsubmodules.html
+++ b/gitsubmodules.html
@@ -951,7 +951,7 @@ from another repository.</p></div>
<h2 id="_active_submodules">ACTIVE SUBMODULES</h2>
<div class="sectionbody">
<div class="paragraph"><p>A submodule is considered active,</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
if <code>submodule.&lt;name&gt;.active</code> is set to <code>true</code>
@@ -984,10 +984,10 @@ if <code>submodule.&lt;name&gt;.url</code> is set.
url = https://example.org/baz</code></pre>
</div></div>
<div class="paragraph"><p>In the above config only the submodule <em>bar</em> and <em>baz</em> are active,
-<em>bar</em> due to (a) and <em>baz</em> due to (c). <em>foo</em> is inactive because
-(a) takes precedence over (c)</p></div>
-<div class="paragraph"><p>Note that (c) is a historical artefact and will be ignored if the
-(a) and (b) specify that the submodule is not active. In other words,
+<em>bar</em> due to (1) and <em>baz</em> due to (3). <em>foo</em> is inactive because
+(1) takes precedence over (3)</p></div>
+<div class="paragraph"><p>Note that (3) is a historical artefact and will be ignored if the
+(1) and (2) specify that the submodule is not active. In other words,
if we have a <code>submodule.&lt;name&gt;.active</code> set to <code>false</code> or if the
submodule&#8217;s path is excluded in the pathspec in <code>submodule.active</code>, the
url doesn&#8217;t matter whether it is present or not. This is illustrated in
@@ -1104,7 +1104,7 @@ your working tree. Alternatively you can set <em>submodule.recurse</em> to have
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-30 16:33:48 JST
+ 2019-05-30 11:14:50 PDT
</div>
</div>
</body>