Thread (2 messages) flat view 2 messages, 2 authors, 2026-02-09
STALE211d

[PATCH] rerere: minor documantation update

From: Junio C Hamano <hidden>
Date: 2026-02-09 18:27:31

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 <redacted>
---
 Documentation/git-rerere.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
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'::
 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help