aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-02 11:20:00 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-02 11:20:00 -0700
commit4a0bcc832a276b68f910729dee698bc6050ef0cc (patch)
tree353d4e283920977d05025e50e37228f4b5b4ebe9
parent5bb67fb7ab035ef399d019440f184aee3608f3e7 (diff)
parent38a15f4755f257ca89535b73e0f267ea4df7d17f (diff)
downloadgit-4a0bcc832a276b68f910729dee698bc6050ef0cc.tar.gz
Merge branch 'js/doc-status-with-submodules-mark-up-fix'
Docfix. * js/doc-status-with-submodules-mark-up-fix: Documentation/git-status: add missing line breaks
-rw-r--r--Documentation/git-status.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index a051b1e8f3..b27d127b5e 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -245,10 +245,12 @@ U U unmerged, both modified
....
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 `git add` in the superproject to prepare a commit.