From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Nov 2014 17:49:34 GMT
Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines
Message-ID: <xmqqbnof9c9d.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20141109092344.4864.88180.chriscool@tuxfamily.org>

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 ;-).