From: Junio C Hamano <gitster@xxxxxxxxx> 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@xxxxxxxxxxxxx> writes: > >> Make sure we look for trailers before any conflict line >> by reusing the ignore_non_trailer() function. >> >> Helped-by: Junio C Hamano <gitster@xxxxxxxxx> >> Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx> >> --- > > 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html