From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Apr 2016 23:17:49 GMT
Subject: Re: 'next'ed --allow-unrelated-histories could cause lots of grief
Message-ID: <xmqqk2jqr1pe.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160421225739.GA7508@kitenet.net>

Joey Hess <id@joeyh.name> 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.