diff options
Diffstat (limited to 'Documentation')
| -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':: |