Merge branch 'sb/mailmap-updates'

gitster · gitster · commit 3717c73f6205 · 2013-07-30T09:16:40.000-07:00
* sb/mailmap-updates:
  .mailmap: combine more (email, name) to individual persons
diff --git a/.mailmap b/.mailmap
@@ -26,6 +26,8 @@ Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
 Cheng Renquan <crquan@gmail.com>
 Chris Shoemaker <c.shoemaker@cox.net>
 Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
+Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
+Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
 Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
 Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
@@ -74,6 +76,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
 Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
+John 'Warthog9' Hawley <warthog9@kernel.org> <warthog9@eaglescrag.net>
 Jon Loeliger <jdl@jdl.com> <jdl@freescale.com>
 Jon Loeliger <jdl@jdl.com> <jdl@freescale.org>
 Jon Seymour <jon.seymour@gmail.com> <jon@blackcubes.dyndns.org>
@@ -181,6 +184,7 @@ Simon Hausmann <hausmann@kde.org> <shausman@trolltech.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>
+Štěpán Němec <stepnem@gmail.com> <stepan.nemec@gmail.com>
 Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
 Steven Drake <sdrake@xnet.co.nz> <sdrake@ihug.co.nz>
 Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>

-Original file line number
+Diff line change
 Cheng Renquan <[email protected]>
 Chris Shoemaker <[email protected]>
 Chris Wright <[email protected]> <[email protected]>
 +Cord Seele <[email protected]> <[email protected]>
 +Christian Stimming <[email protected]> <[email protected]>
 Csaba Henk <[email protected]> <[email protected]>
 Dan Johnson <[email protected]>
 Dana L. How <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 +John 'Warthog9' Hawley <[email protected]> <[email protected]>
 Jon Loeliger <[email protected]> <[email protected]>
 Jon Loeliger <[email protected]> <[email protected]>
 Jon Seymour <[email protected]> <[email protected]>
 Stefan Naewe <[email protected]> <[email protected]>
 Stefan Naewe <[email protected]> <[email protected]>
 Stefan Sperling <[email protected]> <[email protected]>
 +Štěpán Němec <[email protected]> <[email protected]>
 Stephen Boyd <[email protected]> <[email protected]>
 Steven Drake <[email protected]> <[email protected]>
 Steven Grimm <[email protected]> <[email protected]>