Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

Christian Couder [off-list ref] writes:

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

quoted

Christian Couder [off-list ref] writes:

quoted

Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.

Helped-by: Junio C Hamano [off-list ref]
Signed-off-by: Christian Couder <redacted>
---

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?

Nah, I've already removed it.  You have better things to spend your
time on ;-)