{"thread":{"id":"64961","subject":"[PATCH] doc: rerere-options.adoc: link to git-rerere(1)","startedAt":"2026-02-09T18:13:55Z","lastAt":"2026-02-12T05:37:55Z","messageCount":10,"participants":["kristofferhaugsbakk@fastmail.com","D. Ben Knoble","Junio C Hamano","Kristoffer Haugsbakk","Ben Knoble","Jean-Noël Avila"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"535586","messageId":"doc_link_rerere.328@msgid.xyz","threadId":"64961","inReplyTo":null,"subject":"[PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-02-09T18:13:35Z","receivedAt":"2026-02-09T18:13:55Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nFive commands include these options. Let’s link to the command so that\nthe curious user can learn more about what “rerere” is about.\n\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n\nNotes (series):\n    Topic name: kh/doc-link-rerere\n\n Documentation/rerere-options.adoc | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\nindex b0b920144a6..115882edab1 100644\n--- a/Documentation/rerere-options.adoc\n+++ b/Documentation/rerere-options.adoc\n@@ -4,6 +4,6 @@\n \tthe current conflict to update the files in the working\n \ttree, allow it to also update the index with the result of\n \tresolution.  `--no-rerere-autoupdate` is a good way to\n-\tdouble-check what `rerere` did and catch potential\n+\tdouble-check what linkgit:git-rerere[1] did and catch potential\n \tmismerges, before committing the result to the index with a\n \tseparate `git add`.\n\nbase-commit: 67ad42147a7acc2af6074753ebd03d904476118f\n-- \n2.53.0.26.g2afa8602a26\n\n"},{"id":"535606","messageId":"CALnO6CAET9GOsNCdmd3_Jp5Qr3Rfxn8cgmu9n0N8s7uNYpCchg@mail.gmail.com","threadId":"64961","inReplyTo":"doc_link_rerere.328@msgid.xyz","subject":"Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"D. Ben Knoble","fromEmail":"ben.knoble@gmail.com","sentAt":"2026-02-09T21:57:11Z","receivedAt":"2026-02-09T21:57:24Z","isPatch":true,"sender":{"key":"ben.knoble@gmail.com","avatar":"https://avatars.githubusercontent.com/u/22802209?v=4"},"body":"On Mon, Feb 9, 2026 at 1:14 PM <kristofferhaugsbakk@fastmail.com> wrote:\n>\n> From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n>\n> Five commands include these options. Let’s link to the command so that\n> the curious user can learn more about what “rerere” is about.\n>\n> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n> ---\n>\n> Notes (series):\n>     Topic name: kh/doc-link-rerere\n>\n>  Documentation/rerere-options.adoc | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n> index b0b920144a6..115882edab1 100644\n> --- a/Documentation/rerere-options.adoc\n> +++ b/Documentation/rerere-options.adoc\n> @@ -4,6 +4,6 @@\n>         the current conflict to update the files in the working\n>         tree, allow it to also update the index with the result of\n>         resolution.  `--no-rerere-autoupdate` is a good way to\n> -       double-check what `rerere` did and catch potential\n> +       double-check what linkgit:git-rerere[1] did and catch potential\n>         mismerges, before committing the result to the index with a\n>         separate `git add`.\n\nMinor: should this adjacent be linkgit too? I thought yes, but on\nsecond read we really are talking about the command.\n\nAnyway, agreed that rerere should get linked. Thanks!\n\n-- \nD. Ben Knoble\n"},{"id":"535611","messageId":"xmqqzf5h36dc.fsf@gitster.g","threadId":"64961","inReplyTo":"CALnO6CAET9GOsNCdmd3_Jp5Qr3Rfxn8cgmu9n0N8s7uNYpCchg@mail.gmail.com","subject":"Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-02-09T22:21:51Z","receivedAt":"2026-02-09T22:21:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"D. Ben Knoble\" <ben.knoble@gmail.com> writes:\n\n>> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n>> index b0b920144a6..115882edab1 100644\n>> --- a/Documentation/rerere-options.adoc\n>> +++ b/Documentation/rerere-options.adoc\n>> @@ -4,6 +4,6 @@\n>>         the current conflict to update the files in the working\n>>         tree, allow it to also update the index with the result of\n>>         resolution.  `--no-rerere-autoupdate` is a good way to\n>> -       double-check what `rerere` did and catch potential\n>> +       double-check what linkgit:git-rerere[1] did and catch potential\n>>         mismerges, before committing the result to the index with a\n>>         separate `git add`.\n>\n> Minor: should this adjacent be linkgit too? I thought yes, but on\n> second read we really are talking about the command.\n>\n> Anyway, agreed that rerere should get linked. Thanks!\n\nIf you are happy with the end result, I would not complain, but\nwhich _other_ potential thing were you wondering if it should\nacquire \"linkgit:\"?\n"},{"id":"535613","messageId":"d262682d-78d0-4990-b89f-5b8fa836e7f9@app.fastmail.com","threadId":"64961","inReplyTo":"CALnO6CAET9GOsNCdmd3_Jp5Qr3Rfxn8cgmu9n0N8s7uNYpCchg@mail.gmail.com","subject":"Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-02-09T22:23:07Z","receivedAt":"2026-02-09T22:23:28Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Mon, Feb 9, 2026, at 22:57, D. Ben Knoble wrote:\n>>[snip]\n>> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n>> index b0b920144a6..115882edab1 100644\n>> --- a/Documentation/rerere-options.adoc\n>> +++ b/Documentation/rerere-options.adoc\n>> @@ -4,6 +4,6 @@\n>>         the current conflict to update the files in the working\n>>         tree, allow it to also update the index with the result of\n>>         resolution.  `--no-rerere-autoupdate` is a good way to\n>> -       double-check what `rerere` did and catch potential\n>> +       double-check what linkgit:git-rerere[1] did and catch potential\n>>         mismerges, before committing the result to the index with a\n>>         separate `git add`.\n>\n> Minor: should this adjacent be linkgit too? I thought yes, but on\n> second read we really are talking about the command.\n>\n> Anyway, agreed that rerere should get linked. Thanks!\n\nThe `git add`? Good question. I considered it. At first it seemed like\ntoo much of a “apply this command”, if that even makes sense. But now I\nthink rendering it as\n\n    separate git-add(1).\n\nMakes sense.\n\nThanks for taking a look. :)\n"},{"id":"535620","messageId":"A9E7502B-3AAC-4242-9BAA-47D5B4C7D151@gmail.com","threadId":"64961","inReplyTo":"xmqqzf5h36dc.fsf@gitster.g","subject":"Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"Ben Knoble","fromEmail":"ben.knoble@gmail.com","sentAt":"2026-02-09T23:12:16Z","receivedAt":"2026-02-09T23:12:28Z","isPatch":true,"sender":{"key":"ben.knoble@gmail.com","avatar":"https://avatars.githubusercontent.com/u/22802209?v=4"},"body":"\n> Le 9 févr. 2026 à 17:21, Junio C Hamano <gitster@pobox.com> a écrit :\n> \n> \"D. Ben Knoble\" <ben.knoble@gmail.com> writes:\n> \n>>> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n>>> index b0b920144a6..115882edab1 100644\n>>> --- a/Documentation/rerere-options.adoc\n>>> +++ b/Documentation/rerere-options.adoc\n>>> @@ -4,6 +4,6 @@\n>>>       the current conflict to update the files in the working\n>>>       tree, allow it to also update the index with the result of\n>>>       resolution.  `--no-rerere-autoupdate` is a good way to\n>>> -       double-check what `rerere` did and catch potential\n>>> +       double-check what linkgit:git-rerere[1] did and catch potential\n>>>       mismerges, before committing the result to the index with a\n>>>       separate `git add`.\n>> Minor: should this adjacent be linkgit too? I thought yes, but on\n>> second read we really are talking about the command.\n>> Anyway, agreed that rerere should get linked. Thanks!\n> \n> If you are happy with the end result, I would not complain, but\n> which _other_ potential thing were you wondering if it should\n> acquire \"linkgit:\"?\n\nDoh, typo: the « git add » as Kristoffer read my mind ;)"},{"id":"535710","messageId":"V2_doc_link_rerere.34f@msgid.xyz","threadId":"64961","inReplyTo":"doc_link_rerere.328@msgid.xyz","subject":"[PATCH v2] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-02-10T19:56:49Z","receivedAt":"2026-02-10T19:57:03Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nFive commands include these options. Let’s link to the command so that\nthe curious user can learn more about what “rerere” is about.\n\nIt’s also better to consistently refer to things like\ne.g. “git-subcommand(1)” over `git subcommand` or `subcommand`.\n\nAlso apply the same treatment to git-add(1).\n\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n\nNotes (series):\n    Topic name (applied): kh/doc-rerere-options-xref\n    \n    v2: Same for git-add(1) and expand on the more general point of it all.\n\n Documentation/rerere-options.adoc | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\nindex b0b920144a6..4395fe05356 100644\n--- a/Documentation/rerere-options.adoc\n+++ b/Documentation/rerere-options.adoc\n@@ -4,6 +4,6 @@\n \tthe current conflict to update the files in the working\n \ttree, allow it to also update the index with the result of\n \tresolution.  `--no-rerere-autoupdate` is a good way to\n-\tdouble-check what `rerere` did and catch potential\n+\tdouble-check what linkgit:git-rerere[1] did and catch potential\n \tmismerges, before committing the result to the index with a\n-\tseparate `git add`.\n+\tseparate linkgit:git-add[1].\n\nInterdiff against v1:\n  diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n  index 115882edab1..4395fe05356 100644\n  --- a/Documentation/rerere-options.adoc\n  +++ b/Documentation/rerere-options.adoc\n  @@ -6,4 +6,4 @@\n   \tresolution.  `--no-rerere-autoupdate` is a good way to\n   \tdouble-check what linkgit:git-rerere[1] did and catch potential\n   \tmismerges, before committing the result to the index with a\n  -\tseparate `git add`.\n  +\tseparate linkgit:git-add[1].\n\nbase-commit: 67ad42147a7acc2af6074753ebd03d904476118f\n-- \n2.53.0.26.g2afa8602a26\n\n"},{"id":"535713","messageId":"CALnO6CDxOPXuFMp4Us8cvbF5FZeT74fSKDFy5Wd7D4jmF9=QAQ@mail.gmail.com","threadId":"64961","inReplyTo":"V2_doc_link_rerere.34f@msgid.xyz","subject":"Re: [PATCH v2] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"D. Ben Knoble","fromEmail":"ben.knoble@gmail.com","sentAt":"2026-02-10T21:33:15Z","receivedAt":"2026-02-10T21:33:28Z","isPatch":true,"sender":{"key":"ben.knoble@gmail.com","avatar":"https://avatars.githubusercontent.com/u/22802209?v=4"},"body":"On Tue, Feb 10, 2026 at 2:57 PM <kristofferhaugsbakk@fastmail.com> wrote:\n>\n> From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n>\n> Five commands include these options. Let’s link to the command so that\n> the curious user can learn more about what “rerere” is about.\n>\n> It’s also better to consistently refer to things like\n> e.g. “git-subcommand(1)” over `git subcommand` or `subcommand`.\n>\n> Also apply the same treatment to git-add(1).\n>\n> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n> ---\n>\n> Notes (series):\n>     Topic name (applied): kh/doc-rerere-options-xref\n>\n>     v2: Same for git-add(1) and expand on the more general point of it all.\n>\n>  Documentation/rerere-options.adoc | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n> index b0b920144a6..4395fe05356 100644\n> --- a/Documentation/rerere-options.adoc\n> +++ b/Documentation/rerere-options.adoc\n> @@ -4,6 +4,6 @@\n>         the current conflict to update the files in the working\n>         tree, allow it to also update the index with the result of\n>         resolution.  `--no-rerere-autoupdate` is a good way to\n> -       double-check what `rerere` did and catch potential\n> +       double-check what linkgit:git-rerere[1] did and catch potential\n>         mismerges, before committing the result to the index with a\n> -       separate `git add`.\n> +       separate linkgit:git-add[1].\n>\n> Interdiff against v1:\n>   diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n>   index 115882edab1..4395fe05356 100644\n>   --- a/Documentation/rerere-options.adoc\n>   +++ b/Documentation/rerere-options.adoc\n>   @@ -6,4 +6,4 @@\n>         resolution.  `--no-rerere-autoupdate` is a good way to\n>         double-check what linkgit:git-rerere[1] did and catch potential\n>         mismerges, before committing the result to the index with a\n>   -     separate `git add`.\n>   +     separate linkgit:git-add[1].\n>\n> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f\n> --\n> 2.53.0.26.g2afa8602a26\n\nExcellent, thanks for also including the rationale. LGTM!\n\n-- \nD. Ben Knoble\n"},{"id":"535735","messageId":"1a4060f1-6607-4b50-859d-927642eb34df@free.fr","threadId":"64961","inReplyTo":"doc_link_rerere.328@msgid.xyz","subject":"Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2026-02-11T07:14:13Z","receivedAt":"2026-02-11T07:14:30Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Le 09/02/2026 à 19:13, kristofferhaugsbakk@fastmail.com a écrit :\n> From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n> \n> Five commands include these options. Let’s link to the command so that\n> the curious user can learn more about what “rerere” is about.\n> \n> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n> ---\n> \n> Notes (series):\n>     Topic name: kh/doc-link-rerere\n> \n>  Documentation/rerere-options.adoc | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n> index b0b920144a6..115882edab1 100644\n> --- a/Documentation/rerere-options.adoc\n> +++ b/Documentation/rerere-options.adoc\n> @@ -4,6 +4,6 @@\n>  \tthe current conflict to update the files in the working\n>  \ttree, allow it to also update the index with the result of\n>  \tresolution.  `--no-rerere-autoupdate` is a good way to\n> -\tdouble-check what `rerere` did and catch potential\n> +\tdouble-check what linkgit:git-rerere[1] did and catch potential\n>  \tmismerges, before committing the result to the index with a\n>  \tseparate `git add`.\n> \n> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f\n\nI'm not fond of introducing linkgit macro that can create auto-reference\nin manual pages. At the moment, we need to use conditional inclusion in\nthe manual pages source, but I wonder if we could simply filter out the\nlinks in the macro itself.\n"},{"id":"535778","messageId":"xmqqikc3waju.fsf@gitster.g","threadId":"64961","inReplyTo":"1a4060f1-6607-4b50-859d-927642eb34df@free.fr","subject":"Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-02-11T15:43:17Z","receivedAt":"2026-02-11T15:43:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Noël Avila <jn.avila@free.fr> writes:\n\n>> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n>> index b0b920144a6..115882edab1 100644\n>> --- a/Documentation/rerere-options.adoc\n>> +++ b/Documentation/rerere-options.adoc\n>> @@ -4,6 +4,6 @@\n>>  \tthe current conflict to update the files in the working\n>>  \ttree, allow it to also update the index with the result of\n>>  \tresolution.  `--no-rerere-autoupdate` is a good way to\n>> -\tdouble-check what `rerere` did and catch potential\n>> +\tdouble-check what linkgit:git-rerere[1] did and catch potential\n>>  \tmismerges, before committing the result to the index with a\n>>  \tseparate `git add`.\n>> \n>> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f\n>\n> I'm not fond of introducing linkgit macro that can create auto-reference\n> in manual pages. At the moment, we need to use conditional inclusion in\n> the manual pages source, but I wonder if we could simply filter out the\n> links in the macro itself.\n\nFWIW, before deciding to accept the patch, I did check if\ngit-rerere.adoc included this file (it didn't), but if we can make\nthe macro smarter to do so, it would be great, as that would avoid\npeople including this file there later without realizing that they\nnow need to make the mark-up conditional.\n\nThis particular patch does not have to be blocked waiting for such\nan improvement, though, right?\n\n\n"},{"id":"535820","messageId":"1ce11655-eaef-407f-86af-956a190f5358@free.fr","threadId":"64961","inReplyTo":"xmqqikc3waju.fsf@gitster.g","subject":"Re: [PATCH] doc: rerere-options.adoc: link to git-rerere(1)","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2026-02-12T05:37:45Z","receivedAt":"2026-02-12T05:37:55Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Le 11/02/2026 à 16:43, Junio C Hamano a écrit :\n> Jean-Noël Avila <jn.avila@free.fr> writes:\n> \n>>> diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc\n>>> index b0b920144a6..115882edab1 100644\n>>> --- a/Documentation/rerere-options.adoc\n>>> +++ b/Documentation/rerere-options.adoc\n>>> @@ -4,6 +4,6 @@\n>>>  \tthe current conflict to update the files in the working\n>>>  \ttree, allow it to also update the index with the result of\n>>>  \tresolution.  `--no-rerere-autoupdate` is a good way to\n>>> -\tdouble-check what `rerere` did and catch potential\n>>> +\tdouble-check what linkgit:git-rerere[1] did and catch potential\n>>>  \tmismerges, before committing the result to the index with a\n>>>  \tseparate `git add`.\n>>>\n>>> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f\n>>\n>> I'm not fond of introducing linkgit macro that can create auto-reference\n>> in manual pages. At the moment, we need to use conditional inclusion in\n>> the manual pages source, but I wonder if we could simply filter out the\n>> links in the macro itself.\n> \n> FWIW, before deciding to accept the patch, I did check if\n> git-rerere.adoc included this file (it didn't), but if we can make\n> the macro smarter to do so, it would be great, as that would avoid\n> people including this file there later without realizing that they\n> now need to make the mark-up conditional.\n\n\nAh, adding the options of rerere in git-rerere manual page is then\nsomething that will need to be done when reworking it.\n\n\n> \n> This particular patch does not have to be blocked waiting for such\n> an improvement, though, right?\n> \n\nNo it doesn't. I don't intend to scratch this itch soon.\n"}]}