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

doc: fix singular/plural mismatch in git-rerere 

conflict -> conflicts

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2026-04-16 23:36:30 +00:00 committed by Junio C Hamano
parent 31f23c958b
commit 60e8015d23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rerere.adoc
View File

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

Reset the conflict resolutions which rerere has recorded for the current
conflict in paths that match <pathspec>.
conflicts in paths that match <pathspec>.

'diff'::