Re: What's cooking in git.git (Oct 2011, #01; Tue, 4)

From: Brad King <brad.king@kitware.com>
Date: Oct 6, 2011, 15:55 UTC
Message-ID: <4E8DCF79.50200@kitware.com>
In-Reply-To: <7vvcs49ofl.fsf@alter.siamese.dyndns.org>

On 10/4/2011 10:12 PM, Junio C Hamano wrote:

Show 6 quoted lines

> [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

The above three commits are independent of the other two, no? They form a complete topic demonstrating and fixing a merge bug independent from pushing. The other commits:

Show 7 quoted lines

>   - push: Don't push a repository with unpushed submodules
>    (merged to 'next' on 2011-08-24 at 398e764)
>   + push: teach --recurse-submodules the on-demand option
>   (this branch is tangled with fg/submodule-auto-push.)
>
> The second from the bottom one needs to be replaced with a properly
> written commit log message.

are a separate topic.

-Brad