threads / patch / 64962

patchrerere: minor documantation update

Subject: [PATCH] rerere: minor documantation update

## tl;dr

2 messages between Feb 9, 2026 and Feb 9, 2026. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Junio C Hamano· Feb 9, 2026, 18:27 UTC · lore

Let's not call our users "it". Also "rerere forget \*.c" does not forget resolutions for just '*.c'; it forgets for all the files whose filenames end with ".c".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/git-rerere.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Show changes to diff +2 −2
diff --git c/Documentation/git-rerere.adoc w/Documentation/git-rerere.adoc
index 992b469270..99f967b7a4 100644
--- c/Documentation/git-rerere.adoc
+++ w/Documentation/git-rerere.adoc
@@ -32,7 +32,7 @@ COMMANDS
 --------
 
 Normally, 'git rerere' is run without arguments or user-intervention.
-However, it has several commands that allow it to interact with
+However, it has several commands that allow users to interact with
 its working state.
 
 'clear'::
@@ -44,7 +44,7 @@ will automatically invoke this command.
 'forget' <pathspec>::
 
 Reset the conflict resolutions which rerere has recorded for the current
-conflict in <pathspec>.
+conflict in paths that match <pathspec>.
 
 'diff'::
 
Kristoffer Haugsbakk· Feb 9, 2026, 19:48 UTC · re: Junio C Hamano · lore

Re: [PATCH] rerere: minor documantation update

> [PATCH] rerere: minor documantation update
s/documantation/documentation/
On Mon, Feb 9, 2026, at 19:27, Junio C Hamano wrote:
Show 7 quoted lines
> Let's not call our users "it".  Also "rerere forget \*.c" does not
> forget resolutions for just '*.c'; it forgets for all the files
> whose filenames end with ".c".
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>[snip]
Looks good.

← back to recent threads