git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] git-status.txt: fix minor asciidoc format issue

From
Javier Mora <cousteaulecommandant@gmail.com>
Date
Oct 4, 2023, 02:09 UTC
Message-ID
<CAH1-q0g_YXxBMJE+ZOv93VMk3c-Evhr6m+387DLMf_j_+u+cOA@mail.gmail.com>
In-Reply-To
<xmqq4jj7zc5b.fsf@gitster.g>

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ó:
Show 45 quoted lines
>
> "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.
>
Previous: Junio C HamanoNext: cousteau via GitGitGadget
Message 7 of 9 in “git-status.txt: fix minor asciidoc format issue”
  1. git-status.txt: fix minor asciidoc format issuecousteau via GitGitGadget, Oct 1, 2023
  2. Junio C HamanoOct 1, 2023
  3. Javier MoraOct 1, 2023
  4. Junio C HamanoOct 2, 2023
  5. git-status.txt: fix minor asciidoc format issuecousteau via GitGitGadget, Oct 3, 2023
  6. Junio C HamanoOct 3, 2023
  7. Javier MoraOct 4, 2023
  8. git-status.txt: fix minor asciidoc format issuecousteau via GitGitGadget, Oct 4, 2023
  9. Junio C HamanoOct 4, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.