Git development
 help / color / mirror / Atom feed
From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>, Elijah Newren <newren@gmail.com>
Subject: [PATCH 5/6] doc: fix singular/plural mismatch in git-rerere
Date: Thu, 16 Apr 2026 23:36:30 +0000	[thread overview]
Message-ID: <93e1556bd86a55501f6894f22d2c1b47fe464dba.1776382591.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2092.git.1776382591.gitgitgadget@gmail.com>

From: Elijah Newren <newren@gmail.com>

conflict -> conflicts

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 Documentation/git-rerere.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'::
 
-- 
gitgitgadget


  parent reply	other threads:[~2026-04-16 23:36 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-16 23:36 [PATCH 0/6] Documentation fixes for changes made this cycle Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 1/6] RelNotes/2.54.0: fix typos and grammar Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 2/6] CodingGuidelines: fix subject-verb agreement Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 3/6] doc: fix self-referential config in sendemail.smtpSSLClientKey Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 4/6] doc: fix plural agreement in pack.preferBitmapTips Elijah Newren via GitGitGadget
2026-04-16 23:36 ` Elijah Newren via GitGitGadget [this message]
2026-04-16 23:36 ` [PATCH 6/6] doc: fix grammar errors in submodule description Elijah Newren via GitGitGadget

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=93e1556bd86a55501f6894f22d2c1b47fe464dba.1776382591.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox