Jeff King <peff@xxxxxxxx> writes: > On Mon, Feb 21, 2011 at 03:33:14PM -0800, Junio C Hamano wrote: > ... >> This conflicts with 2840824 (diffcore-rename: fall back to -C when -C -C >> busts the rename limit, 2011-01-06) on 'pu', unfortunately. > > Do you want to do the merge, or do you want me to rebase on top of > 2840824? Please check the resolution queued on 'pu'; I suspect that your series should graduate before the fall-back-to-c-from-c-c topic, so I'd rather not to see you rebase this. -- 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