Skip to content

Commit 2668b6b

Browse files
committed
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>
1 parent bb5c624 commit 2668b6b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

Documentation/git-rerere.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ COMMANDS
3232
--------
3333

3434
Normally, 'git rerere' is run without arguments or user-intervention.
35-
However, it has several commands that allow it to interact with
35+
However, it has several commands that allow users to interact with
3636
its working state.
3737

3838
'clear'::
@@ -44,7 +44,7 @@ will automatically invoke this command.
4444
'forget' <pathspec>::
4545

4646
Reset the conflict resolutions which rerere has recorded for the current
47-
conflict in <pathspec>.
47+
conflict in paths that match <pathspec>.
4848

4949
'diff'::
5050

0 commit comments

Comments
 (0)