From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>
Subject: [PATCH] rerere: minor documantation update
Date: Mon, 09 Feb 2026 10:27:29 -0800 [thread overview]
Message-ID: <xmqqikc54vse.fsf@gitster.g> (raw)
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".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-rerere.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git c/Documentation/git-rerere.adoc w/Documentation/git-rerere.adoc
index 992b469270..99f967b7a4 100644
--- c/Documentation/git-rerere.adoc
+++ w/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'::
next reply other threads:[~2026-02-09 18:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-09 18:27 Junio C Hamano [this message]
2026-02-09 19:48 ` [PATCH] rerere: minor documantation update Kristoffer Haugsbakk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqikc54vse.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.