summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2014-10-20 18:50:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-21 11:01:27 -0700
commit8b148bf085fdcbacc42db5966467bd382962f27c (patch)
tree8eec6f824a22df5d613316c5b91142e58bf19a2c /.mailmap
parenttransport: free leaking head in transport_print_push_status() (diff)
downloadtgif-8b148bf085fdcbacc42db5966467bd382962f27c.tar.xz
.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 8aefb5a452..bb6f52ecd9 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>