summaryrefslogtreecommitdiffstats
path: root/git-status.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-19 22:35:10 -0700
committerJunio C Hamano <gitster@pobox.com>2017-04-19 22:35:10 -0700
commit52a094d73a03abe677880d74fe3ec08f73583aa7 (patch)
tree5ab92370d4203b6fa4f147f8fffb2ffa328a1c42 /git-status.html
parent761b4816f4f926a06d6c0fc060763ff857b9acfa (diff)
downloadgit-htmldocs-52a094d73a03abe677880d74fe3ec08f73583aa7.tar.gz
Autogenerated HTML docs for v2.13.0-rc0
Diffstat (limited to 'git-status.html')
-rw-r--r--git-status.html12
1 files changed, 11 insertions, 1 deletions
diff --git a/git-status.html b/git-status.html
index 01fb59c0a..fa36346b2 100644
--- a/git-status.html
+++ b/git-status.html
@@ -1022,6 +1022,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
+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>
<div class="paragraph"><p>If -b is used the short-format status is preceded by a line</p></div>
<div class="literalblock">
<div class="content">
@@ -1058,6 +1067,7 @@ and the terminating newline (but a space still separates the status
field from the first filename). Third, filenames containing special
characters are not specially formatted; no quoting or
backslash-escaping is performed.</p></div>
+<div class="paragraph"><p>Any submodule changes are reported as modified <code>M</code> instead of <code>m</code> or single <code>?</code>.</p></div>
</div>
<div class="sect2">
<h3 id="_porcelain_format_version_2">Porcelain Format Version 2</h3>
@@ -1215,7 +1225,7 @@ output but does not honor these settings.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-03-13 00:01:26 PDT
+Last updated 2017-04-19 22:32:42 PDT
</div>
</div>
</body>