From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Oct 2011 18:15:54 GMT
Subject: Re: [PATCH 0/2] Do not search submodules in deep recursive merge
Message-ID: <7v4nzc69lx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <cover.1318509069.git.brad.king@kitware.com>

Brad King <brad.king@kitware.com> writes:

> On 10/12/2011 2:48 PM, Junio C Hamano wrote:
>> [Stalled]
>>
>> * hv/submodule-merge-search (2011-08-26) 5 commits
>>   - submodule: Search for merges only at end of recursive merge
>>   - allow multiple calls to submodule merge search for the same path
>>   - submodule: Demonstrate known breakage during recursive merge
>>   - push: Don't push a repository with unpushed submodules
>>   - push: teach --recurse-submodules the on-demand option
>>   (this branch is tangled with fg/submodule-auto-push.)
>
> AFAICT these two topics are tangled due revision traversal interactions.
> I've untangled the two "submodule:" commits from this stalled topic and
> rebased on master (34c4461a) resolving one conflict.

Thanks.