diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-04-16 21:28:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-16 21:28:09 -0700 |
| commit | c7ae2d5bb8f97b06f1b31df2f2456646924c8be7 (patch) | |
| tree | 19b28978fb0f5585282e5ab7eaf675ae31e3d63e /Documentation/git-rerere.adoc | |
| parent | 1630c3464a2b55d4239f276c7ede0848db06b632 (diff) | |
| parent | e8955061076952cc5eab0300424fc48b601fe12d (diff) | |
| download | git-next.tar.gz git-next.zip | |
Sync with 'master'next
Diffstat (limited to 'Documentation/git-rerere.adoc')
| -rw-r--r-- | Documentation/git-rerere.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.adoc b/Documentation/git-rerere.adoc index 99f967b7a4..4e6ab9a27c 100644 --- a/Documentation/git-rerere.adoc +++ b/Documentation/git-rerere.adoc @@ -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':: |