From: Junio C Hamano Date: Mon, 9 Feb 2026 18:27:29 +0000 (-0800) Subject: rerere: minor documantation update X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2668b6bdc4aabe29924390fd52cb0e56fc2473c6;p=thirdparty%2Fgit.git rerere: minor documantation update 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 --- diff --git a/Documentation/git-rerere.adoc b/Documentation/git-rerere.adoc index 992b469270..99f967b7a4 100644 --- a/Documentation/git-rerere.adoc +++ b/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' :: Reset the conflict resolutions which rerere has recorded for the current -conflict in . +conflict in paths that match . 'diff'::