From: "cousteau via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Javier Mora <cousteaulecommandant@gmail.com>,
cousteau <cousteaulecommandant@gmail.com>,
Javier Mora <cousteaulecommandant@gmail.com>
Subject: [PATCH v3] git-status.txt: fix minor asciidoc format issue
Date: Wed, 04 Oct 2023 02:22:45 +0000 [thread overview]
Message-ID: <pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1591.v2.git.1696350802820.gitgitgadget@gmail.com>
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>
---
git-status.txt: minor asciidoc format correction
The paragraph below the list of short option combinations was hard to
read; turns out it wasn't correctly formatted in asciidoc.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1591%2Fcousteaulecommandant%2Fman-git-status-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1591/cousteaulecommandant/man-git-status-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1591
Range-diff vs v2:
1: 811885a275f ! 1: 819499eb4c8 git-status.txt: fix minor asciidoc format issue
@@ Metadata
## Commit message ##
git-status.txt: fix minor asciidoc format issue
- The paragraph below the list of short option combinations
- isn't correctly formatted, making the result hard to read.
+ 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>
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.
base-commit: d0e8084c65cbf949038ae4cc344ac2c2efd77415
--
gitgitgadget
next prev parent reply other threads:[~2023-10-04 2:22 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 ` cousteau via GitGitGadget [this message]
2023-10-04 16:56 ` [PATCH v3] " 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=pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=cousteaulecommandant@gmail.com \
--cc=git@vger.kernel.org \
/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).