Avery Pennarun <apenwarr@xxxxxxxxx> writes: > 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. Catching up on e-mail. :) I'm happy to do either (rebase or filter-branch). Just let me know. I'm about the send the test-lib.sh patch separately as it's a prereq for putting git-subtrees tests in contrib and I think it's generally useful anyway. -Dave -- 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