diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:39:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:39:10 -0700 |
| commit | d387868a7d29621e85e8c5c061d1f50586db74e5 (patch) | |
| tree | 0e94cb6cc9bd3615adf051107dd6ac071fa5b9c7 /compat/setenv.c | |
| parent | Git 1.7.9.4 (diff) | |
| download | tgif-d387868a7d29621e85e8c5c061d1f50586db74e5.tar.xz | |
merge: backport GIT_MERGE_AUTOEDIT support
Even though 1.7.9.x series does not open the editor by default
when merging in general, it does do so in one occassion: when
merging an annotated tag. And worse yet, there is no good way
for older scripts to decline this.
Backport the support for GIT_MERGE_AUTOEDIT environment variable
from 1.7.10 track to help those stuck on 1.7.9.x maintenance
track.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/setenv.c')
0 files changed, 0 insertions, 0 deletions