Re: What's cooking in git.git (Dec 2010, #06; Tue, 21)

From: Thiago Farina <tfransosi@gmail.com>
Date: Dec 22, 2010, 11:05 UTC
Message-ID: <AANLkTin_u9FiZf-hbnhY0Dp+LifctxH8wKDL=yRrSpm+@mail.gmail.com>
In-Reply-To: <7vlj3i5zz9.fsf@alter.siamese.dyndns.org>

On Tue, Dec 21, 2010 at 11:59 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 5 quoted lines

> * tf/commit-list-prefix (2010-11-26) 1 commit
>  (merged to 'next' on 2010-12-21 at 16e1351)
>  + commit: Add commit_list prefix in two function names.
>
> This churn

Since you said that, can could you drop this patch? I don't mind if you discard this patch since you consider it a CHURN[1].

> already introduced an unnecessary conflict.

Which conflict? If you say, I could try to fix it.

> It is not by itself a biggie, but these things tend to add up.

How *these things* add a conflict? This is a new thing to me really.

[1] Hope I will learn what this means and avoid it, something like, unnecessary, stupid, really trivial, etc...