git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 5/6] doc: fix singular/plural mismatch in git-rerere

From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Date
Apr 16, 2026, 23:36 UTC
Message-ID
<93e1556bd86a55501f6894f22d2c1b47fe464dba.1776382591.git.gitgitgadget@gmail.com>
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
Previous: Elijah Newren via GitGitGadgetNext: Elijah Newren via GitGitGadget
Message 5 of 7 in “Documentation fixes for changes made this cycle”
  1. 0/6 Documentation fixes for changes made this cycleElijah Newren via GitGitGadget, Apr 16, 2026
  2. 1/6 RelNotes/2.54.0: fix typos and grammarElijah Newren via GitGitGadget, Apr 16, 2026
  3. 3/6 doc: fix self-referential config in sendemail.smtpSSLClientKeyElijah Newren via GitGitGadget, Apr 16, 2026
  4. 4/6 doc: fix plural agreement in pack.preferBitmapTipsElijah Newren via GitGitGadget, Apr 16, 2026
  5. 5/6 doc: fix singular/plural mismatch in git-rerereElijah Newren via GitGitGadget, Apr 16, 2026
  6. 2/6 CodingGuidelines: fix subject-verb agreementElijah Newren via GitGitGadget, Apr 16, 2026
  7. 6/6 doc: fix grammar errors in submodule descriptionElijah Newren via GitGitGadget, Apr 16, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.