From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 08 Feb 2018 20:29:53 GMT
Subject: Re: [PATCH] docs/interpret-trailers: fix agreement error
Message-ID: <xmqqeflvql6m.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180208101358.af4ecca9865dca4f04431bce@google.com>

Jonathan Tan <jonathantanmy@google.com> writes:

> On Thu,  8 Feb 2018 02:56:14 +0000
> "brian m. carlson" <sandals@crustytoothpaste.net> wrote:
>
>>  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
>
> Ah, good catch. Maybe "a group of one or more lines that (i) consists of all
> trailers, or (ii) contains ..."?

Your version reads better perhaps because it talks about "a group"
without placing undue stress on the fact that the member of the
group are usually multiple---I guess it is better over Brian's?