summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2018-09-25 10:26:19 +0200
committerDavid Pursehouse <david.pursehouse@gmail.com>2018-09-25 19:03:22 -0400
commit9c71cda06f347d276d825cf735e61bc0b4b91adc (patch)
treea4d3be93a4bd0d55b99a1828c715a90918a8384a /.mailmap
parent6a2be5c12ceb388c89dce7e88a00ac51504973cb (diff)
downloadjgit-9c71cda06f347d276d825cf735e61bc0b4b91adc.tar.gz
jgit-9c71cda06f347d276d825cf735e61bc0b4b91adc.zip
Update .mailmap
The .mailmap file is used to map author and committer names and email addresses to canonical real names and email addresses. See https://git-scm.com/docs/git-check-mailmap Change-Id: I720326ad204bd0737e8ace2620ccbd1347114ef4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap28
1 files changed, 18 insertions, 10 deletions
diff --git a/.mailmap b/.mailmap
index 7c9dc3d7ce..f0bc990d8d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +1,18 @@
-Han-Wen Nienhuys <hanwen@google.com> Han-Wen NIenhuys <hanwen@google.com>
-Mark Ingram <markdingram@gmail.com> markdingram <markdingram@gmail.com>
-Roberto Tyley <roberto.tyley@guardian.co.uk> roberto <roberto.tyley@guardian.co.uk>
-Saša Živkov <sasa.zivkov@sap.com> Sasa Zivkov <sasa.zivkov@sap.com>
-Saša Živkov <sasa.zivkov@sap.com> Saša Živkov <zivkov@gmail.com>
-Saša Živkov <sasa.zivkov@sap.com> Sasa Zivkov <zivkov@gmail.com>
-Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <sop@google.com>
-Shawn Pearce <spearce@spearce.org> Shawn Pearce <sop@google.com>
-Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <spearce@spearce.org>
-Terry Parker <tparker@google.com> tparker <tparker@google.com>
+Chris Aniszczyk <caniszczyk@gmail.com> Chris Aniszczyk <zx@eclipsesource.com>
+Christian Halstrick <christian.halstrick@sap.com> Christian Halstrick <christian.halstrick@gmail.com>
+Dani Megert <Daniel_Megert@ch.ibm.com> Daniel Megert <daniel_megert@ch.ibm.com>
+David Pursehouse <david.pursehouse@gmail.com> David Pursehouse <david.pursehouse@sonymobile.com>
+Han-Wen Nienhuys <hanwen@google.com> Han-Wen NIenhuys <hanwen@google.com>
+Hector Oswaldo Caballero <hector.caballero@ericsson.com> Hector Caballero <hector.caballero@ericsson.com>
+Lars Vogel <Lars.Vogel@vogella.com> Lars Vogel <Lars.Vogel@gmail.com>
+Mark Ingram <markdingram@gmail.com> markdingram <markdingram@gmail.com>
+Markus Duft <markus.duft@ssi-schaefer.com> Markus Duft <markus.duft@salomon.at>
+Michael Keppler <michael.keppler@gmx.de> Michael Keppler <Michael.Keppler@gmx.de>
+Roberto Tyley <roberto.tyley@guardian.co.uk> roberto <roberto.tyley@guardian.co.uk>
+Saša Živkov <sasa.zivkov@sap.com> Sasa Zivkov <sasa.zivkov@sap.com>
+Saša Živkov <sasa.zivkov@sap.com> Saša Živkov <zivkov@gmail.com>
+Saša Živkov <sasa.zivkov@sap.com> Sasa Zivkov <zivkov@gmail.com>
+Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <sop@google.com>
+Shawn Pearce <spearce@spearce.org> Shawn Pearce <sop@google.com>
+Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <spearce@spearce.org>
+Terry Parker <tparker@google.com> tparker <tparker@google.com>