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

[PATCH] docs/interpret-trailers: fix agreement error

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Feb 8, 2018, 02:56 UTC
Message-ID
<20180208025614.872885-1-sandals@crustytoothpaste.net>

In the description of git interpret-trailers, we describe "a group…of lines" that have certain characteristics. Because the first option uses a plural verb (referring to "lines"), the second option must also use plural verbs for parallelism.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
I'm somewhat on the fence about this patch.  To me, the number
disagreement is very jarring.  However, I'm also sympathetic to the fact
that the latter sentence reads more naturally in the singular.
Opinions on improvements welcome.
 Documentation/git-interpret-trailers.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 9dd19a1dd9..de5011e564 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -51,8 +51,8 @@ with only spaces at the end of the commit message part, one blank line
 will be added before the new trailer.
 
 Existing trailers are extracted from the input message by looking for
-a group of one or more lines that (i) are all trailers, or (ii) contains at
-least one Git-generated or user-configured trailer and consists of at
+a group of one or more lines that (i) are all trailers, or (ii) contain at
+least one Git-generated or user-configured trailer and consist of at
 least 25% trailers.
 The group must be preceded by one or more empty (or whitespace-only) lines.
 The group must either be at the end of the message or be the last
Next: Jonathan Tan
Message 1 of 6 in “docs/interpret-trailers: fix agreement error”
  1. docs/interpret-trailers: fix agreement errorbrian m. carlson, Feb 8, 2018
  2. Jonathan TanFeb 8, 2018
  3. Junio C HamanoFeb 8, 2018
  4. brian m. carlsonFeb 10, 2018
  5. docs/interpret-trailers: fix agreement errorbrian m. carlson, Feb 13, 2018
  6. Jonathan TanFeb 13, 2018

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.