{"thread":{"id":"60259","subject":"[PATCH] Documentation/git-status: add missing line breaks","startedAt":"2023-09-22T14:14:46Z","lastAt":"2023-09-22T22:29:54Z","messageCount":2,"participants":["Josh Soref via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"482141","messageId":"pull.1590.git.1695392082207.gitgitgadget@gmail.com","threadId":"60259","inReplyTo":null,"subject":"[PATCH] Documentation/git-status: add missing line breaks","fromName":"Josh Soref via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-09-22T14:14:42Z","receivedAt":"2023-09-22T14:14:46Z","isPatch":true,"sender":{"key":"jsoref@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2119212?v=4"},"body":"From: Josh Soref \n\nSigned-off-by: Josh Soref \n---\n Documentation/git-status: add missing line breaks\n \n Most of the content in git help status is well formatted, as you can see\n here:\n \n In the following table, these three classes are shown in separate sections, and these characters are used for X and Y fields for the first two sections that show tracked paths:\n \n • ' ' = unmodified\n \n • M = modified\n \n • T = file type changed (regular file, symbolic link or submodule)\n \n • A = added\n \n • D = deleted\n \n • R = renamed\n \n • C = copied (if config option status.renames is set to \"copies\")\n \n • U = updated but unmerged\n \n X Y Meaning\n -------------------------------------------------\n [AMD] not updated\n M [ MTD] updated in index\n T [ MTD] type changed in index\n A [ MTD] added to index\n D deleted from index\n R [ MTD] renamed in index\n C [ MTD] copied in index\n [MTARC] index and work tree matches\n [ MTARC] M work tree changed since index\n [ MTARC] T type changed in work tree since index\n [ MTARC] D deleted in work tree\n R renamed in work tree\n C copied in work tree\n -------------------------------------------------\n D D unmerged, both deleted\n A U unmerged, added by us\n U D unmerged, deleted by them\n U A unmerged, added by them\n D U unmerged, deleted by us\n A A unmerged, both added\n U U unmerged, both modified\n -------------------------------------------------\n ? ? untracked\n ! ! ignored\n -------------------------------------------------\n \n 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\n files since modified content or untracked files in a submodule cannot be added via git add in the superproject to prepare a commit.\n \n m and ? are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as ? as well.\n \n If -b is used the short-format status is preceded by a line\n \n ## branchname tracking info\n \n \n Except for the part:\n \n 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\n \n \n It appears that it wanted to be a table. With this patch, the html\n renders as:\n \n Submodules have more state and instead report\n \n M the submodule has a different HEAD than\n recorded in the index\n m the submodule has modified content\n ? the submodule has untracked files\n \n since modified content or untracked files in a submodule cannot be added via git add in the superproject to prepare a commit.\n \n m and ? are applied recursively. For example if a nested submodule in a submodule contains an untracked file, this is reported as ? as well.\n \n If -b is used the short-format status is preceded by a line\n \n ## branchname tracking info\n \n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1590%2Fjsoref%2Fgit-status-missing-line-break-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1590/jsoref/git-status-missing-line-break-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1590\n\n Documentation/git-status.txt | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex a051b1e8f38..b27d127b5e2 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -245,10 +245,12 @@ U U unmerged, both modified\n ....\n \n Submodules have more state and instead report\n+\n \t\tM the submodule has a different HEAD than\n \t\t recorded in the index\n \t\tm the submodule has modified content\n \t\t? the submodule has untracked files\n+\n since modified content or untracked files in a submodule cannot be added\n via `git add` in the superproject to prepare a commit.\n \n\nbase-commit: bda494f4043963b9ec9a1ecd4b19b7d1cd9a0518\n-- \ngitgitgadget\n"},{"id":"482191","messageId":"xmqqmsxdyh7q.fsf@gitster.g","threadId":"60259","inReplyTo":"pull.1590.git.1695392082207.gitgitgadget@gmail.com","subject":"Re: [PATCH] Documentation/git-status: add missing line breaks","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-09-22T22:29:45Z","receivedAt":"2023-09-22T22:29:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Josh Soref via GitGitGadget\" writes:\n\n> From: Josh Soref \n>\n> Signed-off-by: Josh Soref \n> ---\n> @@ -245,10 +245,12 @@ U U unmerged, both modified\n> ....\n> \n> Submodules have more state and instead report\n> +\n> \t\tM the submodule has a different HEAD than\n> \t\t recorded in the index\n> \t\tm the submodule has modified content\n> \t\t? the submodule has untracked files\n> +\n> since modified content or untracked files in a submodule cannot be added\n> via `git add` in the superproject to prepare a commit.\n\nAh, good find.\n\nThanks, will queue.\n"}]}