From: Christian Couder <chriscool@tuxfamily.org>
Date: Mon, 10 Nov 2014 19:05:02 GMT
Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines
Message-ID: <20141110.200502.1295000903783079007.chriscool@tuxfamily.org>
In-Reply-To: <xmqqbnof9c9d.fsf@gitster.dls.corp.google.com>

From: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines
Date: Mon, 10 Nov 2014 09:49:34 -0800

> Christian Couder <chriscool@tuxfamily.org> writes:
> 
>> Make sure we look for trailers before any conflict line
>> by reusing the ignore_non_trailer() function.
>>
>> Helped-by: Junio C Hamano <gitster@pobox.com>
>> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>> ---
> 
> It makes sense to unify the logic to decide where the trailer block
> is, I would think.  I however don't think I helped this change in
> any way, not more than "maintained the codebase as a solid
> foundation to build new features on", but at that point it would
> apply to any other change and not worth mentioning ;-).

Do you want me to resend the series with only the Helped-by removed?