{"thread":{"id":"64962","subject":"[PATCH] rerere: minor documantation update","startedAt":"2026-02-09T18:27:31Z","lastAt":"2026-02-09T19:50:06Z","messageCount":2,"participants":["Junio C Hamano","Kristoffer Haugsbakk"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"535590","messageId":"xmqqikc54vse.fsf@gitster.g","threadId":"64962","inReplyTo":null,"subject":"[PATCH] rerere: minor documantation update","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-02-09T18:27:29Z","receivedAt":"2026-02-09T18:27:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Let's not call our users \"it\".  Also \"rerere forget \\*.c\" does not\nforget resolutions for just '*.c'; it forgets for all the files\nwhose filenames end with \".c\".\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Documentation/git-rerere.adoc | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git c/Documentation/git-rerere.adoc w/Documentation/git-rerere.adoc\nindex 992b469270..99f967b7a4 100644\n--- c/Documentation/git-rerere.adoc\n+++ w/Documentation/git-rerere.adoc\n@@ -32,7 +32,7 @@ COMMANDS\n --------\n \n Normally, 'git rerere' is run without arguments or user-intervention.\n-However, it has several commands that allow it to interact with\n+However, it has several commands that allow users to interact with\n its working state.\n \n 'clear'::\n@@ -44,7 +44,7 @@ will automatically invoke this command.\n 'forget' <pathspec>::\n \n Reset the conflict resolutions which rerere has recorded for the current\n-conflict in <pathspec>.\n+conflict in paths that match <pathspec>.\n \n 'diff'::\n \n"},{"id":"535598","messageId":"e14ebaf9-0035-49be-8321-3449abcd9c6b@app.fastmail.com","threadId":"64962","inReplyTo":"xmqqikc54vse.fsf@gitster.g","subject":"Re: [PATCH] rerere: minor documantation update","fromName":"Kristoffer Haugsbakk","fromEmail":"code@khaugsbakk.name","sentAt":"2026-02-09T19:48:57Z","receivedAt":"2026-02-09T19:50:06Z","isPatch":true,"sender":{"key":"code@khaugsbakk.name","avatar":"https://avatars.githubusercontent.com/u/2229597?v=4"},"body":"> [PATCH] rerere: minor documantation update\n\ns/documantation/documentation/\n\nOn Mon, Feb 9, 2026, at 19:27, Junio C Hamano wrote:\n> Let's not call our users \"it\".  Also \"rerere forget \\*.c\" does not\n> forget resolutions for just '*.c'; it forgets for all the files\n> whose filenames end with \".c\".\n>\n> Signed-off-by: Junio C Hamano <gitster@pobox.com>\n> ---\n>[snip]\n\nLooks good.\n"}]}