diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-09 10:27:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-09 11:58:53 -0800 |
| commit | 2668b6bdc4aabe29924390fd52cb0e56fc2473c6 (patch) | |
| tree | d6002c8f583f8d8b04a21567e6288b1f0df61a35 | |
| parent | bb5c624209fcaebd60b9572b2cc8c61086e39b57 (diff) | |
| download | git-2668b6bdc4aabe29924390fd52cb0e56fc2473c6.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-rerere.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
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' <pathspec>:: Reset the conflict resolutions which rerere has recorded for the current -conflict in <pathspec>. +conflict in paths that match <pathspec>. 'diff':: |