Skip to contentSkip to conversation

rerere: minor documantation update

PATCH In review Junio C Hamano 2 participants 2 messages Feb 9 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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".

---
 Documentation/git-rerere.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/git-rerere.adoc +2 -2
index 992b469270..99f967b7a4 100644
@@ -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'::
 
#1 lore raw
Quoted 1 line

[PATCH] rerere: minor documantation update

s/documantation/documentation/

Quoted 7 lines · Junio C Hamano

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".

---
[snip]

Looks good.