On Mon, May 06, 2013 at 11:40:47PM -0700, Junio C Hamano wrote: > I queued this, and will push the result out on the side of 'pu' > closer to 'next'. Could you double check the conflict resolution? I eyeballed the "--cc" output, as well as the resulting file, and it looks fine to me. > I haven't got around to the peel-ref-cleanup yet. I'd leave that for now; the current code does have a bug, but it's not triggerable through any of the current callers, so we can afford to take our time. I'll try to work up a patch that just goes on top of Michael's series. -Peff -- 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