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 v2] git-status.txt: fix minor asciidoc format issue
Date: Tue, 03 Oct 2023 13:25:36 -0700 [thread overview]
Message-ID: <xmqq4jj7zc5b.fsf@gitster.g> (raw)
In-Reply-To: <pull.1591.v2.git.1696350802820.gitgitgadget@gmail.com> (cousteau via GitGitGadget's message of "Tue, 03 Oct 2023 16:33:22 +0000")
"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.
next prev parent reply other threads:[~2023-10-03 20:25 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 [this message]
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
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=xmqq4jj7zc5b.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).