Brad King <brad.king@xxxxxxxxxxx> 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. -- 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