{"thread":{"id":"60288","subject":"[PATCH] git-status.txt: fix minor asciidoc format issue","startedAt":"2023-10-01T20:52:20Z","lastAt":"2023-10-04T16:56:17Z","messageCount":9,"participants":["cousteau via GitGitGadget","Junio C Hamano","Javier Mora"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"482475","messageId":"pull.1591.git.1696193527923.gitgitgadget@gmail.com","threadId":"60288","inReplyTo":null,"subject":"[PATCH] git-status.txt: fix minor asciidoc format issue","fromName":"cousteau via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-01T20:52:07Z","receivedAt":"2023-10-01T20:52:20Z","isPatch":true,"sender":{"key":"name:cousteau","avatar":null},"body":"From: Javier Mora \n\nThe paragraph below the list of short option combinations\nisn't correctly formatted, making the result hard to read.\n\nSigned-off-by: Javier Mora \n---\n git-status.txt: minor asciidoc format correction\n \n The paragraph below the list of short option combinations was hard to\n read; turns out it wasn't correctly formatted in asciidoc.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1591%2Fcousteaulecommandant%2Fman-git-status-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1591/cousteaulecommandant/man-git-status-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1591\n\n Documentation/git-status.txt | 9 +++++----\n 1 file changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex a051b1e8f38..48f46eb2047 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -245,10 +245,11 @@ U U unmerged, both modified\n ....\n \n Submodules have more state and instead report\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+* 'M' = the submodule has a different HEAD than 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\n via `git add` in the superproject to prepare a commit.\n \n\nbase-commit: bcb6cae2966cc407ca1afc77413b3ef11103c175\n-- \ngitgitgadget\n"},{"id":"482476","messageId":"xmqq7co6f1le.fsf@gitster.g","threadId":"60288","inReplyTo":"pull.1591.git.1696193527923.gitgitgadget@gmail.com","subject":"Re: [PATCH] git-status.txt: fix minor asciidoc format issue","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-01T21:57:01Z","receivedAt":"2023-10-01T22:00:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"cousteau via GitGitGadget\" writes:\n\n> From: Javier Mora \n>\n> The paragraph below the list of short option combinations\n> isn't correctly formatted, making the result hard to read.\n\nIn , Josh fixed\nthis issue a bit differently but in the same spirit, and the fix in\n38a15f47 (Documentation/git-status: add missing line breaks,\n2023-09-22) is about to hit the 'master' branch.\n\nThanks.\n\n[Reference]\n\n* https://lore.kernel.org/git/pull.1590.git.1695392082207.gitgitgadget@gmail.com/\n\n"},{"id":"482478","messageId":"CAH1-q0g+xdb_mUi0sXrQjF4nkX1Nkpops_V1e86qACLxs1uPqg@mail.gmail.com","threadId":"60288","inReplyTo":"xmqq7co6f1le.fsf@gitster.g","subject":"Re: [PATCH] git-status.txt: fix minor asciidoc format issue","fromName":"Javier Mora","fromEmail":"cousteaulecommandant@gmail.com","sentAt":"2023-10-01T23:51:53Z","receivedAt":"2023-10-01T23:56:08Z","isPatch":true,"sender":{"key":"cousteaulecommandant@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6584870?v=4"},"body":"Yeah, I saw that right after I submitted my patch :(\nOnly problem is that that patch doesn't use the same formatting as the\nrest of the document (uses a code block / preformatted text instead of\na list as other options in the document do) so my version of the patch\nis just a minor cosmetic improvement now. (In any case, the result is\nquite similar in the plain text manpage version; the change is more\nnoticeable in the HTML version though.)\n\nIf you're still interested in the \"format as a list\" issue and it\nmakes things easier to you, I can submit a merge of both commits\n(fixing the merge conflict).\n\nEl dom, 1 oct 2023 a las 22:57, Junio C Hamano () escribió:\n>\n> \"cousteau via GitGitGadget\" writes:\n>\n> > From: Javier Mora \n> >\n> > The paragraph below the list of short option combinations\n> > isn't correctly formatted, making the result hard to read.\n>\n> In , Josh fixed\n> this issue a bit differently but in the same spirit, and the fix in\n> 38a15f47 (Documentation/git-status: add missing line breaks,\n> 2023-09-22) is about to hit the 'master' branch.\n>\n> Thanks.\n>\n> [Reference]\n>\n> * https://lore.kernel.org/git/pull.1590.git.1695392082207.gitgitgadget@gmail.com/\n>\n"},{"id":"482543","messageId":"xmqqzg103l8e.fsf@gitster.g","threadId":"60288","inReplyTo":"CAH1-q0g+xdb_mUi0sXrQjF4nkX1Nkpops_V1e86qACLxs1uPqg@mail.gmail.com","subject":"Re: [PATCH] git-status.txt: fix minor asciidoc format issue","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-02T18:58:09Z","receivedAt":"2023-10-02T18:58:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Javier Mora writes:\n\n> Only problem is that that patch doesn't use the same formatting as the\n> rest of the document (uses a code block / preformatted text instead of\n> a list as other options in the document do) so my version of the patch\n> is just a minor cosmetic improvement now.\n\nEither one is a minor cosmetic improvement ;-) I do agree with you\nthat it is more appropriate to use the enumeration. A patch on top\nof 'master' (which now has Josh's fix) would be very much welcome.\n\nThanks.\n"},{"id":"482572","messageId":"pull.1591.v2.git.1696350802820.gitgitgadget@gmail.com","threadId":"60288","inReplyTo":"pull.1591.git.1696193527923.gitgitgadget@gmail.com","subject":"[PATCH v2] git-status.txt: fix minor asciidoc format issue","fromName":"cousteau via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-03T16:33:22Z","receivedAt":"2023-10-03T16:33:31Z","isPatch":true,"sender":{"key":"name:cousteau","avatar":null},"body":"From: Javier Mora \n\nThe paragraph below the list of short option combinations\nisn't correctly formatted, making the result hard to read.\n\nSigned-off-by: Javier Mora \n---\n git-status.txt: minor asciidoc format correction\n \n The paragraph below the list of short option combinations was hard to\n read; turns out it wasn't correctly formatted in asciidoc.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1591%2Fcousteaulecommandant%2Fman-git-status-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1591/cousteaulecommandant/man-git-status-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1591\n\nRange-diff vs v1:\n\n 1: b3c97ca9e0f ! 1: 811885a275f git-status.txt: fix minor asciidoc format issue\n @@ Commit message\n \n ## Documentation/git-status.txt ##\n @@ Documentation/git-status.txt: 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 +* 'M' = the submodule has a different HEAD than recorded in the index\n +* 'm' = the submodule has modified content\n +* '?' = the submodule has untracked files\n -+\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\n\n Documentation/git-status.txt | 7 +++----\n 1 file changed, 3 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex b27d127b5e2..48f46eb2047 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -246,10 +246,9 @@ U U unmerged, both modified\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+* 'M' = the submodule has a different HEAD than 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\n via `git add` in the superproject to prepare a commit.\n\nbase-commit: d0e8084c65cbf949038ae4cc344ac2c2efd77415\n-- \ngitgitgadget\n"},{"id":"482603","messageId":"xmqq4jj7zc5b.fsf@gitster.g","threadId":"60288","inReplyTo":"pull.1591.v2.git.1696350802820.gitgitgadget@gmail.com","subject":"Re: [PATCH v2] git-status.txt: fix minor asciidoc format issue","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-03T20:25:36Z","receivedAt":"2023-10-03T20:25:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"cousteau via GitGitGadget\" writes:\n\n> From: Javier Mora \n>\n> The paragraph below the list of short option combinations\n> isn't correctly formatted, making the result hard to read.\n>\n> Signed-off-by: Javier Mora \n> ---\n\nThe above probably no longer describes the situation the patch\nintends to correct, I suspect. It used to be near-impossible hard\nto read, but at least with them indented they are legible.\n\n\tThe additional states for submodules are typeset differently\n\tfrom how the states for paths for normal blobs are listed as\n\tenumeration. Format them in the same way for consistency.\n\nor something like that, perhaps.\n\n> Documentation/git-status.txt | 7 +++----\n> 1 file changed, 3 insertions(+), 4 deletions(-)\n>\n> diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\n> index b27d127b5e2..48f46eb2047 100644\n> --- a/Documentation/git-status.txt\n> +++ b/Documentation/git-status.txt\n> @@ -246,10 +246,9 @@ U U unmerged, both modified\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> +* 'M' = the submodule has a different HEAD than 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\n> via `git add` in the superproject to prepare a commit.\n\nThanks for making this part of the documentation better.\n\n"},{"id":"482634","messageId":"CAH1-q0g_YXxBMJE+ZOv93VMk3c-Evhr6m+387DLMf_j_+u+cOA@mail.gmail.com","threadId":"60288","inReplyTo":"xmqq4jj7zc5b.fsf@gitster.g","subject":"Re: [PATCH v2] git-status.txt: fix minor asciidoc format issue","fromName":"Javier Mora","fromEmail":"cousteaulecommandant@gmail.com","sentAt":"2023-10-04T02:09:42Z","receivedAt":"2023-10-04T02:09:59Z","isPatch":true,"sender":{"key":"cousteaulecommandant@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6584870?v=4"},"body":"Fair enough; I'll update the commit message. I just thought it still\nworked more or less so I left it as is.\n\nEl mar, 3 oct 2023 a las 21:25, Junio C Hamano () escribió:\n>\n> \"cousteau via GitGitGadget\" writes:\n>\n> > From: Javier Mora \n> >\n> > The paragraph below the list of short option combinations\n> > isn't correctly formatted, making the result hard to read.\n> >\n> > Signed-off-by: Javier Mora \n> > ---\n>\n> The above probably no longer describes the situation the patch\n> intends to correct, I suspect. It used to be near-impossible hard\n> to read, but at least with them indented they are legible.\n>\n> The additional states for submodules are typeset differently\n> from how the states for paths for normal blobs are listed as\n> enumeration. Format them in the same way for consistency.\n>\n> or something like that, perhaps.\n>\n> > Documentation/git-status.txt | 7 +++----\n> > 1 file changed, 3 insertions(+), 4 deletions(-)\n> >\n> > diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\n> > index b27d127b5e2..48f46eb2047 100644\n> > --- a/Documentation/git-status.txt\n> > +++ b/Documentation/git-status.txt\n> > @@ -246,10 +246,9 @@ U U unmerged, both modified\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> > +* 'M' = the submodule has a different HEAD than 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\n> > via `git add` in the superproject to prepare a commit.\n>\n> Thanks for making this part of the documentation better.\n>\n"},{"id":"482635","messageId":"pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com","threadId":"60288","inReplyTo":"pull.1591.v2.git.1696350802820.gitgitgadget@gmail.com","subject":"[PATCH v3] git-status.txt: fix minor asciidoc format issue","fromName":"cousteau via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-04T02:22:45Z","receivedAt":"2023-10-04T02:22:55Z","isPatch":true,"sender":{"key":"name:cousteau","avatar":null},"body":"From: Javier Mora \n\nThe list of additional XY values for submodules in short format\nisn't formatted consistently with the rest of the document.\nFormat as list for consistency.\n\nSigned-off-by: Javier Mora \n---\n git-status.txt: minor asciidoc format correction\n \n The paragraph below the list of short option combinations was hard to\n read; turns out it wasn't correctly formatted in asciidoc.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1591%2Fcousteaulecommandant%2Fman-git-status-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1591/cousteaulecommandant/man-git-status-v3\nPull-Request: https://github.com/gitgitgadget/git/pull/1591\n\nRange-diff vs v2:\n\n 1: 811885a275f ! 1: 819499eb4c8 git-status.txt: fix minor asciidoc format issue\n @@ Metadata\n ## Commit message ##\n git-status.txt: fix minor asciidoc format issue\n \n - The paragraph below the list of short option combinations\n - isn't correctly formatted, making the result hard to read.\n + The list of additional XY values for submodules in short format\n + isn't formatted consistently with the rest of the document.\n + Format as list for consistency.\n \n Signed-off-by: Javier Mora \n \n\n\n Documentation/git-status.txt | 7 +++----\n 1 file changed, 3 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex b27d127b5e2..48f46eb2047 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -246,10 +246,9 @@ U U unmerged, both modified\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+* 'M' = the submodule has a different HEAD than 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\n via `git add` in the superproject to prepare a commit.\n\nbase-commit: d0e8084c65cbf949038ae4cc344ac2c2efd77415\n-- \ngitgitgadget\n"},{"id":"482659","messageId":"xmqqa5syqqc7.fsf@gitster.g","threadId":"60288","inReplyTo":"pull.1591.v3.git.1696386165616.gitgitgadget@gmail.com","subject":"Re: [PATCH v3] git-status.txt: fix minor asciidoc format issue","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-04T16:56:08Z","receivedAt":"2023-10-04T16:56:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"cousteau via GitGitGadget\" writes:\n\n> From: Javier Mora \n>\n> The list of additional XY values for submodules in short format\n> isn't formatted consistently with the rest of the document.\n> Format as list for consistency.\n>\n> Signed-off-by: Javier Mora \n> ---\n> ...\n> diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\n> index b27d127b5e2..48f46eb2047 100644\n> --- a/Documentation/git-status.txt\n> +++ b/Documentation/git-status.txt\n> @@ -246,10 +246,9 @@ U U unmerged, both modified\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> +* 'M' = the submodule has a different HEAD than 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\n> via `git add` in the superproject to prepare a commit.\n>\n> base-commit: d0e8084c65cbf949038ae4cc344ac2c2efd77415\n\nPerfect. Thanks.\n"}]}