summaryrefslogtreecommitdiffstats
path: root/git-submodule.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-13 17:29:14 -0800
committerJunio C Hamano <gitster@pobox.com>2018-02-13 17:29:14 -0800
commit640779d2fa2811b69c7c071dceb886299418257d (patch)
tree9144f07f4071bbf90438a08cf290b1a099acf6f5 /git-submodule.html
parent2ef0ba3d29e4b0c3a24887c2cf8d02ee62c852d1 (diff)
downloadgit-htmldocs-640779d2fa2811b69c7c071dceb886299418257d.tar.gz
Autogenerated HTML docs for v2.16.1-194-gb2e45
Diffstat (limited to 'git-submodule.html')
-rw-r--r--git-submodule.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/git-submodule.html b/git-submodule.html
index 60106864d..7b3b4c47c 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -819,8 +819,8 @@ status [--cached] [--recursive] [--] [&lt;path&gt;&#8230;]
Show the status of the submodules. This will print the SHA-1 of the
currently checked out commit for each submodule, along with the
submodule path and the output of <em>git describe</em> for the
- SHA-1. Each SHA-1 will be prefixed with <code>-</code> if the submodule is not
- initialized, <code>+</code> if the currently checked out submodule commit
+ SHA-1. Each SHA-1 will possibly be prefixed with <code>-</code> if the submodule is
+ not initialized, <code>+</code> if the currently checked out submodule commit
does not match the SHA-1 found in the index of the containing
repository and <code>U</code> if the submodule has merge conflicts.
</p>
@@ -887,9 +887,9 @@ expects by cloning missing submodules and updating the working tree of
the submodules. The "updating" can be done in several ways depending
on command line options and the value of <code>submodule.&lt;name&gt;.update</code>
configuration variable. The command line option takes precedence over
-the configuration variable. if neither is given, a checkout is performed.
-update procedures supported both from the command line as well as setting
-<code>submodule.&lt;name&gt;.update</code>:</p></div>
+the configuration variable. If neither is given, a <em>checkout</em> is performed.
+The <em>update</em> procedures supported both from the command line as well as
+through the <code>submodule.&lt;name&gt;.update</code> configuration are:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
checkout
@@ -900,7 +900,7 @@ the commit recorded in the superproject will be
checked out in the submodule on a detached HEAD.
</p>
<div class="paragraph"><p>If <code>--force</code> is specified, the submodule will be checked out (using
-<code>git checkout --force</code> if appropriate), even if the commit specified
+<code>git checkout --force</code>), even if the commit specified
in the index of the containing repository already matches the commit
checked out in the submodule.</p></div>
</dd>
@@ -923,8 +923,8 @@ the commit recorded in the superproject will be merged
</p>
</dd>
</dl></div>
-<div class="paragraph"><p>The following procedures are only available via the <code>submodule.&lt;name&gt;.update</code>
-configuration variable:</p></div>
+<div class="paragraph"><p>The following <em>update</em> procedures are only available via the
+<code>submodule.&lt;name&gt;.update</code> configuration variable:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
custom command
@@ -1335,7 +1335,7 @@ for details.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-02-13 17:28:38 PST
</div>
</div>
</body>