From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752794Ab2APAPN (ORCPT ); Sun, 15 Jan 2012 19:15:13 -0500 Received: from hapkido.dreamhost.com ([66.33.216.122]:37126 "EHLO hapkido.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751859Ab2APAPM (ORCPT ); Sun, 15 Jan 2012 19:15:12 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=pcharlan.com; h=message-id:date :from:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; q=dns; s=pcharlan.com; b=VBSVS1HLXjYrEAgz7hm6JpVNWXne3tW65JzTe2rjCl5R1/9tH9EoivU3juxm6 P/tjKyiaKSa4K/jF0YaRGMoLLY97DcCKIrdc5PCXjK4ErPf31No5JwS3O6VcRDkj D7QVFfSfvF6Aa5Ut68I4hK5X3cai0sOcGOWCcEnw38p1mQ= Message-ID: <4F136BE4.4040502@pcharlan.com> Date: Sun, 15 Jan 2012 16:14:28 -0800 From: Pete Harlan User-Agent: Mozilla/5.0 (X11; Linux i686; rv:8.0) Gecko/20111124 Thunderbird/8.0 MIME-Version: 1.0 To: Junio C Hamano Cc: Linus Torvalds , Mark Brown , Liam Girdwood , linux-kernel@vger.kernel.org, Git Mailing List Subject: Re: Re* Regulator updates for 3.3 References: <20120109073727.GF22134@opensource.wolfsonmicro.com> <20120110184530.GE7164@opensource.wolfsonmicro.com> <20120110222711.GK7164@opensource.wolfsonmicro.com> <7vmx9v7z1r.fsf@alter.siamese.dyndns.org> <7vehv77xeq.fsf@alter.siamese.dyndns.org> <7vzkdu7miv.fsf@alter.siamese.dyndns.org> In-Reply-To: <7vzkdu7miv.fsf@alter.siamese.dyndns.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/10/2012 10:59 PM, Junio C Hamano wrote: > There may be existing scripts that leave the standard input and the > standard output of the "git merge" connected to whatever environment the > scripts were started, and such invocation might trigger the above > "interactive session" heuristics. Such scripts can export GIT_MERGE_LEGACY > environment variable set to "yes" to force the traditional behaviour. The name GIT_MERGE_LEGACY gives no clue about what flavor of legacy merge behavior is being enabled. Something like GIT_MERGE_LEGACY_EDIT might be clearer, or perhaps just have GIT_MERGE_EDIT=0 to get the old behavior without reference to whether or not that behavior is considered legacy. --Pete