kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <gitster@pobox.com>
main
Junio C Hamano 2026-02-09 10:27:29 -08:00
parent bb5c624209
commit 2668b6bdc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-rerere.adoc
View File

@ -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'::