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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 4, 2023, 16:56 UTC
Message-ID
<xmqqa5syqqc7.fsf@gitster.g>
In-Reply-To
<pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com>
"cousteau via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 29 quoted lines
> From: Javier Mora <cousteaulecommandant@gmail.com>
>
> The list of additional XY values for submodules in short format
> isn't formatted consistently with the rest of the document.
> Format as list for consistency.
>
> Signed-off-by: Javier Mora <cousteaulecommandant@gmail.com>
> ---
> ...
> 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.
>
> base-commit: d0e8084c65cbf949038ae4cc344ac2c2efd77415
Perfect.  Thanks.
Previous: cousteau via GitGitGadget
Message 9 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.