On Fri, Feb 24, 2012 at 3:56 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Avery Pennarun <apenwarr@xxxxxxxxx> writes: >> Overall I agree that there's little benefit in preserving the history, >> at least as far as I can see, *except* that some code changes were >> submitted by people other than me and squashing those changes might >> conceivably cause licensing confusion down the road. > > That is a good point, and it sounds like a good enough justification to > merge with history, at least for me. Should we filter-branch or rebase the history first, or just leave it as is? Like I said, since I don't expect there to be any more back-and-forth development, rebasing should be pretty harmless. Avery -- 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