From: Pete Harlan <pgit@pcharlan.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>,
linux-kernel@vger.kernel.org,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Re* Regulator updates for 3.3
Date: Sun, 15 Jan 2012 16:14:28 -0800 [thread overview]
Message-ID: <4F136BE4.4040502@pcharlan.com> (raw)
In-Reply-To: <7vzkdu7miv.fsf@alter.siamese.dyndns.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
next prev parent reply other threads:[~2012-01-16 0:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120109073727.GF22134@opensource.wolfsonmicro.com>
[not found] ` <CA+55aFyhoh0rT_ujuE1w3RpuR7kqivYFwPpm66VC-xtq1PiGUQ@mail.gmail.com>
[not found] ` <20120110184530.GE7164@opensource.wolfsonmicro.com>
[not found] ` <CA+55aFxXb7wqfrpozS6iH0k25y-+Uy8_Tavv59JXMhaWrjXLaw@mail.gmail.com>
[not found] ` <20120110222711.GK7164@opensource.wolfsonmicro.com>
2012-01-10 22:54 ` Regulator updates for 3.3 Linus Torvalds
2012-01-10 23:17 ` Mark Brown
2012-01-11 2:28 ` Junio C Hamano
2012-01-11 2:47 ` Linus Torvalds
2012-01-11 3:03 ` Junio C Hamano
2012-01-11 3:14 ` Linus Torvalds
2012-01-11 6:59 ` Re* " Junio C Hamano
2012-01-11 16:14 ` Phil Hord
2012-01-11 16:23 ` Linus Torvalds
2012-01-16 0:14 ` Pete Harlan [this message]
2012-01-16 23:33 ` Junio C Hamano
2012-01-16 23:43 ` Martin Fick
2012-01-17 5:33 ` Pete Harlan
2012-01-17 6:13 ` Junio C Hamano
2012-01-11 3:21 ` Linus Torvalds
2012-01-11 18:40 ` Paul Gortmaker
2012-01-13 19:12 ` [PATCH] merge: Make merge strategy message follow the diffstat Junio C Hamano
2012-01-13 19:27 ` Nguyen Thai Ngoc Duy
2012-01-13 19:49 ` Linus Torvalds
2012-01-17 8:03 ` Miles Bader
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F136BE4.4040502@pcharlan.com \
--to=pgit@pcharlan.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).