summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2014-10-21 01:50:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-21 18:01:27 (GMT)
commit8b148bf085fdcbacc42db5966467bd382962f27c (patch)
tree8eec6f824a22df5d613316c5b91142e58bf19a2c /.mailmap
parentdc76c7f783694557b08f01d99793979c482aee1f (diff)
downloadgit-8b148bf085fdcbacc42db5966467bd382962f27c.zip
git-8b148bf085fdcbacc42db5966467bd382962f27c.tar.gz
git-8b148bf085fdcbacc42db5966467bd382962f27c.tar.bz2
.mailmap: add Stefan Bellers corporate mail address
Note that despite the private address being first and primary, Google owns the copyright on this patch as any other patch I'll be sending signed off by the sbeller@google.com address. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 8aefb5a..bb6f52e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -205,6 +205,7 @@ 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 Beller <stefanbeller@gmail.com> <sbeller@google.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>