From: Junio C Hamano Date: Mon, 23 Oct 2023 20:56:37 +0000 (-0700) Subject: Merge branch 'en/docfixes' X-Git-Tag: v2.43.0-rc0~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d12166d3c8bb12d5a1638c870fc590c4e300a413;p=thirdparty%2Fgit.git Merge branch 'en/docfixes' Documentation typo and grammo fixes. * en/docfixes: (25 commits) documentation: add missing parenthesis documentation: add missing quotes documentation: add missing fullstops documentation: add some commas where they are helpful documentation: fix whitespace issues documentation: fix capitalization documentation: fix punctuation documentation: use clearer prepositions documentation: add missing hyphens documentation: remove unnecessary hyphens documentation: add missing article documentation: fix choice of article documentation: whitespace is already generally plural documentation: fix singular vs. plural documentation: fix verb vs. noun documentation: fix adjective vs. noun documentation: fix verb tense documentation: employ consistent verb tense for a list documentation: fix subject/verb agreement documentation: remove extraneous words ... --- d12166d3c8bb12d5a1638c870fc590c4e300a413 diff --cc Documentation/git-status.txt index 48f46eb204,51f38218f0..10fecc51a7 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@@ -246,11 -246,12 +246,11 @@@ U U unmerged, both modifie 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 + This is since modified content or untracked files in a submodule cannot be added via `git add` in the superproject to prepare a commit. 'm' and '?' are applied recursively. For example if a nested submodule