Joey Hess <id@xxxxxxxxxx> writes: > Junio C Hamano wrote: >> merge: GIT_MERGE_ALLOW_UNRELATED_HISTORIES environment > > I hope this patch lands, it will save me a lot of bother. Yup, it is somewhat ugly but the least bad option among command line option (which would break with older versions of Git), configuration variables (which would encourage users to opt out of safety unconditionallly) and environment (which allows scripts to opt-in), I would say. -- 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