[PATCH v2] git-status.txt: fix minor asciidoc format issue
- From
- cousteau via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Oct 3, 2023, 16:33 UTC
- Message-ID
- <pull.1591.v2.git.1696350802820.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1591.git.1696193527923.gitgitgadget@gmail.com>
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>
---
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-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1591/cousteaulecommandant/man-git-status-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/1591
Range-diff vs v1:
1: b3c97ca9e0f ! 1: 811885a275f git-status.txt: fix minor asciidoc format issue
@@ Commit message
## Documentation/git-status.txt ##
@@ Documentation/git-status.txt: 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.
- 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