diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-02 12:48:04 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-02 12:48:04 -0700 |
commit | c4096feabf5efb4497b6808dfeea8d8693f93e5b (patch) | |
tree | 4c66b275c80cc92ea0c470b401fe633dc98df1b5 /git-status.html | |
parent | 2b1164dcb4d39a0163d4ac1a7ba350140d59ce15 (diff) | |
download | git-htmldocs-c4096feabf5efb4497b6808dfeea8d8693f93e5b.tar.gz |
Autogenerated HTML docs for v2.42.0-307-gd0e80
Diffstat (limited to 'git-status.html')
-rw-r--r-- | git-status.html | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/git-status.html b/git-status.html index ef484c6d9..bb40bdaae 100644 --- a/git-status.html +++ b/git-status.html @@ -1142,12 +1142,15 @@ U U unmerged, both modified ! ! ignored
-------------------------------------------------</code></pre>
</div></div>
-<div class="paragraph"><p>Submodules have more state and instead report
- M the submodule has a different HEAD than
- recorded in the index
- m the submodule has modified content
- ? the submodule has untracked files
-since modified content or untracked files in a submodule cannot be added
+<div class="paragraph"><p>Submodules have more state and instead report</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>M the submodule has a different HEAD than
+ recorded in the index
+m the submodule has modified content
+? the submodule has untracked files</code></pre>
+</div></div>
+<div class="paragraph"><p>since modified content or untracked files in a submodule cannot be added
via <code>git add</code> in the superproject to prepare a commit.</p></div>
<div class="paragraph"><p><em>m</em> and <em>?</em> are applied recursively. For example if a nested submodule
in a submodule contains an untracked file, this is reported as <em>?</em> as well.</p></div>
@@ -1451,7 +1454,7 @@ normal.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-12-18 19:03:12 PST
+ 2023-10-02 12:46:05 PDT
</div>
</div>
</body>
|