summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <stefanbeller@gmail.com>2014-07-23 14:32:10 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-23 11:27:05 -0700
commit98b12a4b9ab319be5bd3dcd003069e8720b8e7a5 (patch)
treec3fcc6cc0c0c55935be79b64ce58f6b82417d392 /builtin/fmt-merge-msg.c
parentgit.1: switch homepage for stats (diff)
downloadtgif-98b12a4b9ab319be5bd3dcd003069e8720b8e7a5.tar.xz
.mailmap: combine Stefan Beller's emails
Google mail has had the extension @googlemail.com for a long time in Germany as @gmail.de was already taken by a competitor. Nowadays the original gmail company isn't there anymore(?), hence Googlemail also introduced @gmail.com in Germany, which I switched to. This changed mail address of mine first appeared in 398dd4bd039680b (2014-07-10, .mailmap: map different names with the same email address together) ironically. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions