| Message ID | pull.1591.v2.git.1696350802820.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] git-status.txt: fix minor asciidoc format issue | expand |
"cousteau via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Javier Mora <cousteaulecommandant@gmail.com> > > The paragraph below the list of short option combinations > isn't correctly formatted, making the result hard to read. > > Signed-off-by: Javier Mora <cousteaulecommandant@gmail.com> > --- The above probably no longer describes the situation the patch intends to correct, I suspect. It used to be near-impossible hard to read, but at least with them indented they are legible. The additional states for submodules are typeset differently from how the states for paths for normal blobs are listed as enumeration. Format them in the same way for consistency. or something like that, perhaps. > Documentation/git-status.txt | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt > index b27d127b5e2..48f46eb2047 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. Thanks for making this part of the documentation better.
Fair enough; I'll update the commit message. I just thought it still worked more or less so I left it as is. El mar, 3 oct 2023 a las 21:25, Junio C Hamano (<gitster@pobox.com>) escribió: > > "cousteau via GitGitGadget" <gitgitgadget@gmail.com> writes: > > > From: Javier Mora <cousteaulecommandant@gmail.com> > > > > The paragraph below the list of short option combinations > > isn't correctly formatted, making the result hard to read. > > > > Signed-off-by: Javier Mora <cousteaulecommandant@gmail.com> > > --- > > The above probably no longer describes the situation the patch > intends to correct, I suspect. It used to be near-impossible hard > to read, but at least with them indented they are legible. > > The additional states for submodules are typeset differently > from how the states for paths for normal blobs are listed as > enumeration. Format them in the same way for consistency. > > or something like that, perhaps. > > > Documentation/git-status.txt | 7 +++---- > > 1 file changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt > > index b27d127b5e2..48f46eb2047 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. > > Thanks for making this part of the documentation better. >
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index b27d127b5e2..48f46eb2047 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.