summaryrefslogtreecommitdiffstats
path: root/gitsubmodules.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-30 16:34:40 +0900
committerJunio C Hamano <gitster@pobox.com>2018-10-30 16:34:40 +0900
commit94d00a5c4ebb12f2552118f261d8f82c05c2501d (patch)
tree89cfa22e35b5476dd4ae8ab79277fa6f2eb25557 /gitsubmodules.html
parenta4df8edd688285dc532353d4075d979d5ec20306 (diff)
downloadgit-htmldocs-94d00a5c4ebb12f2552118f261d8f82c05c2501d.tar.gz
Autogenerated HTML docs for v2.19.1-708-g4ede3
Diffstat (limited to 'gitsubmodules.html')
-rw-r--r--gitsubmodules.html29
1 files changed, 20 insertions, 9 deletions
diff --git a/gitsubmodules.html b/gitsubmodules.html
index 4672d3b96..255365630 100644
--- a/gitsubmodules.html
+++ b/gitsubmodules.html
@@ -951,14 +951,25 @@ 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="literalblock">
-<div class="content">
-<pre><code>(a) if `submodule.&lt;name&gt;.active` is set to `true`
- or
-(b) if the submodule's path matches the pathspec in `submodule.active`
- or
-(c) if `submodule.&lt;name&gt;.url` is set.</code></pre>
-</div></div>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+if <code>submodule.&lt;name&gt;.active</code> is set to <code>true</code>
+</p>
+<div class="paragraph"><p>or</p></div>
+</li>
+<li>
+<p>
+if the submodule&#8217;s path matches the pathspec in <code>submodule.active</code>
+</p>
+<div class="paragraph"><p>or</p></div>
+</li>
+<li>
+<p>
+if <code>submodule.&lt;name&gt;.url</code> is set.
+</p>
+</li>
+</ol></div>
<div class="paragraph"><p>and these are evaluated in this order.</p></div>
<div class="paragraph"><p>For example:</p></div>
<div class="literalblock">
@@ -1093,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-07-18 13:16:04 PDT
+ 2018-10-30 16:33:48 JST
</div>
</div>
</body>