summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-23 11:36:40 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-23 11:36:40 -0700
commit996b0fdbb4ff63bfd880b3901f054139c95611cf (patch)
treee760f781f2c997fd1d26f2779ac00d42ca93f534 /.mailmap
parent6da748a7cebe3911448fabf9426f81c9df9ec54f (diff)
parent740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e (diff)
downloadgit-996b0fdbb4ff63bfd880b3901f054139c95611cf.tar.gz
Sync with v2.0.3
* maint: Git 2.0.3 .mailmap: combine Stefan Beller's emails git.1: switch homepage for stats
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 2edbeb5406..8aefb5a452 100644
--- a/.mailmap
+++ b/.mailmap
@@ -204,6 +204,7 @@ Seth Falcon <seth@userprimary.net> <sfalcon@fhcrc.org>
Shawn O. Pearce <spearce@spearce.org>
Simon Hausmann <hausmann@kde.org> <simon@lst.de>
Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
+Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
Stefan Sperling <stsp@elego.de> <stsp@stsp.name>