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

Merge branch 'jc/doc-rerere-update' 

Doc update.

* jc/doc-rerere-update:
  rerere: minor documantation update
maint
Junio C Hamano 2026-02-17 13:30:43 -08:00
parent 11294bb0fa 2668b6bdc4
commit 05e54d2d60
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'::