On Tue, Feb 9, 2016 at 1:39 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Stefan Beller <sbeller@xxxxxxxxxx> writes: > >> This replaces sb/submodule-parallel-update. >> (which is based on sb/submodule-parallel-fetch) >> >> Thanks to Junio and Jonathan for review! >> >> * s/config_parallel_submodules/parallel_submodules/ as it is not in config any >> more. Also ease up the default setting. >> >> * use an enum for submodule update strategy > > Your earlier sb/submodule-init will need to be rerolled on top, as > it depends on ->update being a string, I think. Sure, I just want to prioritize this series as it is the bottleneck for all other following things (init as well as the groups thing), I think. > >> * This seems to clash with 00/20] refs backend. >>> Applied this on top of a merge between the current 'master' and >>> 'sb/submodule-parallel-update' topic to untangle the dependency; >>> otherwise there is no way for this topic to make progress X-<. >> >> Anything I can do to help with easing the clash? > > Perhaps try to rebase the series on top of such a merge (with this > updated series) yourself and propose it as a basis for the next > reroll for David? In short, working together with topic(s) that > touch the same area? Ok, I'll see if I can find a better commit to base this series on. > > 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