{"thread":{"id":"64904","subject":"[PATCH] doc: shortlog: put back trailer paragraphs","startedAt":"2026-02-02T17:59:55Z","lastAt":"2026-02-03T09:49:12Z","messageCount":4,"participants":["kristofferhaugsbakk@fastmail.com","Jeff King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"534991","messageId":"shortlog_trailers.253@msgid.xyz","threadId":"64904","inReplyTo":null,"subject":"[PATCH] doc: shortlog: put back trailer paragraphs","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-02-02T17:59:42Z","receivedAt":"2026-02-02T17:59:55Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\n47beb37b (shortlog: match commit trailers with --group, 2020-09-27)\nadded the `trailer` bullet point with three paragraphs.[1] Later,\n3dc95e09 (shortlog: support arbitrary commit format `--group`s,\n2022-10-24) put the single-paragraph bullet point about `format` right\nafter the first paragraph about `trailer`. That meant that the second\nand third paragraphs for `trailer` got moved to `format`.\n\nMove the two paragraphs back to `trailer`. We now also need one blank\nline before the final bullet point so that it does not get joined with\nthe second bullet point.\n\n† 1: Technically the bullet list formatting was immediately fixed to\n     include all three paragraphs in 63d24fa0 (shortlog: allow multiple\n     groups to be specified, 2020-09-27)\n\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n Documentation/git-shortlog.adoc | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-shortlog.adoc b/Documentation/git-shortlog.adoc\nindex aa92800c69c..a11b57c1cd7 100644\n--- a/Documentation/git-shortlog.adoc\n+++ b/Documentation/git-shortlog.adoc\n@@ -64,9 +64,6 @@ Each pretty-printed commit will be rewrapped before it is shown.\n    example, if your project uses `Reviewed-by` trailers, you might want\n    to see who has been reviewing with\n    `git shortlog -ns --group=trailer:reviewed-by`.\n- - `format:<format>`, any string accepted by the `--format` option of\n-   'git log'. (See the \"PRETTY FORMATS\" section of\n-   linkgit:git-log[1].)\n +\n Note that commits that do not include the trailer will not be counted.\n Likewise, commits with multiple trailers (e.g., multiple signoffs) may\n@@ -77,6 +74,10 @@ Shortlog will attempt to parse each trailer value as a `name <email>`\n identity. If successful, the mailmap is applied and the email is omitted\n unless the `--email` option is specified. If the value cannot be parsed\n as an identity, it will be taken literally and completely.\n+\n+ - `format:<format>`, any string accepted by the `--format` option of\n+   'git log'. (See the \"PRETTY FORMATS\" section of\n+   linkgit:git-log[1].)\n --\n +\n If `--group` is specified multiple times, commits are counted under each\n\nbase-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed\n-- \n2.53.0.13.gc85a2adbf80\n\n"},{"id":"534993","messageId":"20260202182421.GA3421838@coredump.intra.peff.net","threadId":"64904","inReplyTo":"shortlog_trailers.253@msgid.xyz","subject":"Re: [PATCH] doc: shortlog: put back trailer paragraphs","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2026-02-02T18:24:21Z","receivedAt":"2026-02-02T18:24:31Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Feb 02, 2026 at 06:59:42PM +0100, kristofferhaugsbakk@fastmail.com wrote:\n\n> 47beb37b (shortlog: match commit trailers with --group, 2020-09-27)\n> added the `trailer` bullet point with three paragraphs.[1] Later,\n> 3dc95e09 (shortlog: support arbitrary commit format `--group`s,\n> 2022-10-24) put the single-paragraph bullet point about `format` right\n> after the first paragraph about `trailer`. That meant that the second\n> and third paragraphs for `trailer` got moved to `format`.\n> \n> Move the two paragraphs back to `trailer`. We now also need one blank\n> line before the final bullet point so that it does not get joined with\n> the second bullet point.\n\nYeah, the change in 3dc95e09 was obviously wrong. The results look good\nhere, via both doc-diff output and just eyeballing the generated .html\nfile. Thanks for catching this.\n\n-Peff\n"},{"id":"535000","messageId":"xmqq1pj3ynli.fsf@gitster.g","threadId":"64904","inReplyTo":"20260202182421.GA3421838@coredump.intra.peff.net","subject":"Re: [PATCH] doc: shortlog: put back trailer paragraphs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-02-02T19:03:37Z","receivedAt":"2026-02-02T19:03:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Mon, Feb 02, 2026 at 06:59:42PM +0100, kristofferhaugsbakk@fastmail.com wrote:\n>\n>> 47beb37b (shortlog: match commit trailers with --group, 2020-09-27)\n>> added the `trailer` bullet point with three paragraphs.[1] Later,\n>> 3dc95e09 (shortlog: support arbitrary commit format `--group`s,\n>> 2022-10-24) put the single-paragraph bullet point about `format` right\n>> after the first paragraph about `trailer`. That meant that the second\n>> and third paragraphs for `trailer` got moved to `format`.\n>> \n>> Move the two paragraphs back to `trailer`. We now also need one blank\n>> line before the final bullet point so that it does not get joined with\n>> the second bullet point.\n>\n> Yeah, the change in 3dc95e09 was obviously wrong. The results look good\n> here, via both doc-diff output and just eyeballing the generated .html\n> file. Thanks for catching this.\n\nThanks, both.\n"},{"id":"535042","messageId":"V2_shortlog_trailers.254@msgid.xyz","threadId":"64904","inReplyTo":"shortlog_trailers.253@msgid.xyz","subject":"[PATCH v2] doc: shortlog: put back trailer paragraphs","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-02-03T09:48:52Z","receivedAt":"2026-02-03T09:49:12Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\n47beb37b (shortlog: match commit trailers with --group, 2020-09-27)\nadded the `trailer` bullet point with three paragraphs.[1] Later,\n3dc95e09 (shortlog: support arbitrary commit format `--group`s,\n2022-10-24) put the single-paragraph bullet point about `format` right\nafter the first paragraph about `trailer`. That meant that the second\nand third paragraphs for `trailer` got moved to `format`.\n\nMove the two paragraphs back to `trailer`. We now also need one blank\nline before the final bullet point so that it does not get joined with\nthe second bullet point.\n\n† 1: Technically the bullet list formatting was immediately fixed to\n     include all three paragraphs in 63d24fa0 (shortlog: allow multiple\n     groups to be specified, 2020-09-27)\n\nAcked-by: Jeff King <peff@peff.net>\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n\nNotes (series):\n    v2: add ack\n\n Documentation/git-shortlog.adoc | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-shortlog.adoc b/Documentation/git-shortlog.adoc\nindex aa92800c69c..a11b57c1cd7 100644\n--- a/Documentation/git-shortlog.adoc\n+++ b/Documentation/git-shortlog.adoc\n@@ -64,9 +64,6 @@ Each pretty-printed commit will be rewrapped before it is shown.\n    example, if your project uses `Reviewed-by` trailers, you might want\n    to see who has been reviewing with\n    `git shortlog -ns --group=trailer:reviewed-by`.\n- - `format:<format>`, any string accepted by the `--format` option of\n-   'git log'. (See the \"PRETTY FORMATS\" section of\n-   linkgit:git-log[1].)\n +\n Note that commits that do not include the trailer will not be counted.\n Likewise, commits with multiple trailers (e.g., multiple signoffs) may\n@@ -77,6 +74,10 @@ Shortlog will attempt to parse each trailer value as a `name <email>`\n identity. If successful, the mailmap is applied and the email is omitted\n unless the `--email` option is specified. If the value cannot be parsed\n as an identity, it will be taken literally and completely.\n+\n+ - `format:<format>`, any string accepted by the `--format` option of\n+   'git log'. (See the \"PRETTY FORMATS\" section of\n+   linkgit:git-log[1].)\n --\n +\n If `--group` is specified multiple times, commits are counted under each\n\nInterdiff against v1:\n\nRange-diff against v1:\n1:  e3cdf4b44ad ! 1:  3383edc5164 doc: shortlog: put back trailer paragraphs\n    @@ Commit message\n              include all three paragraphs in 63d24fa0 (shortlog: allow multiple\n              groups to be specified, 2020-09-27)\n     \n    +    Acked-by: Jeff King <peff@peff.net>\n         Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n     \n    +\n    + ## Notes (series) ##\n    +    v2: add ack\n    +\n      ## Documentation/git-shortlog.adoc ##\n     @@ Documentation/git-shortlog.adoc: Each pretty-printed commit will be rewrapped before it is shown.\n         example, if your project uses `Reviewed-by` trailers, you might want\n\nbase-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed\n-- \n2.53.0.13.gc85a2adbf80\n\n"}]}