aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-12 12:18:26 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-12 12:18:26 -0700
commitc70e7a3cfd403fb6d669d3be8fbe3d530d3d8329 (patch)
tree072dc2f37165bed12e7e7448aa8551aba8856e83
parentMerge branch 'rs/parse-opt-ctx-cleanup' (diff)
parentgit-status.txt: fix minor asciidoc format issue (diff)
downloadgit-c70e7a3cfd403fb6d669d3be8fbe3d530d3d8329.tar.gz
git-c70e7a3cfd403fb6d669d3be8fbe3d530d3d8329.zip
Merge branch 'jm/git-status-submodule-states-docfix'
Docfix. * jm/git-status-submodule-states-docfix: git-status.txt: fix minor asciidoc format issue
-rw-r--r--Documentation/git-status.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index b27d127b5e..48f46eb204 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -246,10 +246,9 @@ 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
+* '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.