Messages in this thread | | | Date | Sun, 15 Jan 2012 16:14:28 -0800 | From | Pete Harlan <> | Subject | Re: Re* Regulator updates for 3.3 |
| |
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
| |