* [PATCH] rerere: minor documantation update
@ 2026-02-09 18:27 Junio C Hamano
2026-02-09 19:48 ` Kristoffer Haugsbakk
0 siblings, 1 reply; 2+ messages in thread
From: Junio C Hamano @ 2026-02-09 18:27 UTC (permalink / raw)
To: git; +Cc: Kristoffer Haugsbakk
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(-)
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'::
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-02-09 19:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-09 18:27 [PATCH] rerere: minor documantation update Junio C Hamano
2026-02-09 19:48 ` Kristoffer Haugsbakk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox