Re: [PATCH 3/8] git-merge-recursive-{ours,theirs}

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 30, 2009, 20:01 UTC
Message-ID: <7v1vjflr3v.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7viqcrlrb8.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 10 quoted lines

> Avery Pennarun <apenwarr@gmail.com> writes:
>
>>> I've queued the series with minor fixes to 'pu' and pushed it out.
>>
>> Since I see you didn't change a couple of things you mentioned in
>> earlier comments (the NEEDSWORK comment and the sq-then-eval trick) do
>> you still want me to respin this series?
>
> The commit still is NEEDSWORK and shouldn't be in 'next' in its current
> shape.

Oh, I think you meant the "NEEDSWORK -- we limit to depth 2 when we guess" and that has been with us ever since we added subtree merge, and it is no reason to block the topic. I had the sq-then-eval stuff in mind when I wrote above.

Sorry for the confusion.