diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-17 13:30:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-17 13:30:43 -0800 |
| commit | 05e54d2d60fa76efc82bfe463274014b0a71f22b (patch) | |
| tree | 7182c7dd84733e50c7df7fd2e762ee5c895a4087 | |
| parent | 11294bb0fa540d214d071b32cf74b1ed37b3bbbd (diff) | |
| parent | 2668b6bdc4aabe29924390fd52cb0e56fc2473c6 (diff) | |
| download | git-05e54d2d60fa76efc82bfe463274014b0a71f22b.tar.xz | |
Merge branch 'jc/doc-rerere-update'
Doc update.
* jc/doc-rerere-update:
rerere: minor documantation update
| -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':: |