From: Junio C Hamano <gitster@pobox.com>
To: "cousteau via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Javier Mora <cousteaulecommandant@gmail.com>
Subject: Re: [PATCH v3] git-status.txt: fix minor asciidoc format issue
Date: Wed, 04 Oct 2023 09:56:08 -0700 [thread overview]
Message-ID: <xmqqa5syqqc7.fsf@gitster.g> (raw)
In-Reply-To: <pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com> (cousteau via GitGitGadget's message of "Wed, 04 Oct 2023 02:22:45 +0000")
"cousteau via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 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.
prev parent reply other threads:[~2023-10-04 16:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-01 20:52 [PATCH] git-status.txt: fix minor asciidoc format issue cousteau via GitGitGadget
2023-10-01 21:57 ` Junio C Hamano
2023-10-01 23:51 ` Javier Mora
2023-10-02 18:58 ` Junio C Hamano
2023-10-03 16:33 ` [PATCH v2] " cousteau via GitGitGadget
2023-10-03 20:25 ` Junio C Hamano
2023-10-04 2:09 ` Javier Mora
2023-10-04 2:22 ` [PATCH v3] " cousteau via GitGitGadget
2023-10-04 16:56 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa5syqqc7.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=cousteaulecommandant@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).