summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-06-15 23:33:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-06-15 23:33:06 -0700
commit1367214417ee55266ab951cf198bf1aa7e051965 (patch)
tree7ed11b238a27af814a2b725ae5be43d93238a41a /diffcore-pickaxe.c
parentmerge-recursive: refuse to merge binary files (diff)
downloadtgif-1367214417ee55266ab951cf198bf1aa7e051965.tar.xz
$EMAIL is a last resort fallback, as it's system-wide.
$EMAIL is a system-wide setup that is used for many many many applications. If the git user chose a specific user.email setup, then _this_ should be honoured rather than $EMAIL. [jc: cherry-picked ec563e8 from 'master'] Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions