Merge branch 'sb/mailmap-updates'

gitster · gitster · commit 6f7d6ec30389 · 2013-08-09T14:30:13.000-07:00
* sb/mailmap-updates:
  .mailmap: fixup entries
diff --git a/.mailmap b/.mailmap
@@ -14,6 +14,7 @@ Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
 Alex Vandiver <alex@chmrr.net> <alexmv@MIT.EDU>
 Alexander Gavrilov <angavrilov@gmail.com>
 Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
+Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
@@ -31,6 +32,7 @@ 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>
+Dana L. How <danahow@gmail.com> Dana How
 Daniel Barkalow <barkalow@iabervon.org>
 David Brown <git@davidb.org> <davidb@quicinc.com>
 David D. Kilzer <ddkilzer@kilzer.net>
@@ -65,6 +67,7 @@ J. Bruce Fields <bfields@citi.umich.edu> <bfields@fieldses.org>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jakub Narębski <jnareb@gmail.com>
+James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
@@ -92,8 +95,8 @@ Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
 Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
 Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
 Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
-Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@treskal.com>
-Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@yoghurt.hemma.treskal.com>
+Karl Wiberg <kha@treskal.com> Karl  Hasselström
+Karl Wiberg <kha@treskal.com> <kha@yoghurt.hemma.treskal.com>
 Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
 Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
 Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
@@ -177,6 +180,7 @@ Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
 Ryan Anderson <ryan@michonline.com> <rda@google.com>
 Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
 Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
+Sam Vilain <sam@vilain.net> sam@vilain.net
 Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
 Sean Estabrooks <seanlkml@sympatico.ca>
 Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
@@ -191,6 +195,7 @@ Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
 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>
+Steven Grimm <koreth@midwinter.com> koreth@midwinter.com
 Steven Walter <stevenrwalter@gmail.com> <swalter@lexmark.com>
 Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
 Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>

-Original file line number
+Diff line change
 Alex Vandiver <[email protected]> <[email protected]>
 Alexander Gavrilov <[email protected]>
 Alexey Shumkin <[email protected]> <[email protected]>
 +Alexey Shumkin <[email protected]> <[email protected]>
 Anders Kaseorg <[email protected]> <[email protected]>
 Anders Kaseorg <[email protected]> <[email protected]>
 Aneesh Kumar K.V <[email protected]>
 Csaba Henk <[email protected]> <[email protected]>
 Dan Johnson <[email protected]>
 Dana L. How <[email protected]> <[email protected]>
 +Dana L. How <[email protected]> Dana How
 Daniel Barkalow <[email protected]>
 David Brown <[email protected]> <[email protected]>
 David D. Kilzer <[email protected]>
 J. Bruce Fields <[email protected]> <[email protected]>
 J. Bruce Fields <[email protected]> <[email protected]>
 Jakub Narębski <[email protected]>
 +James Y Knight <[email protected]> <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jay Soffian <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
 -Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
 -Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
 +Karl Wiberg <[email protected]> Karl  Hasselström
 +Karl Wiberg <[email protected]> <[email protected]>
 Karsten Blees <[email protected]> <[email protected]>
 Karsten Blees <[email protected]> <[email protected]>
 Kay Sievers <[email protected]> <[email protected]>
 Ryan Anderson <[email protected]> <[email protected]>
 Salikh Zakirov <[email protected]> <[email protected]>
 Sam Vilain <[email protected]> <[email protected]>
 +Sam Vilain <[email protected]> [email protected]
 Santi Béjar <[email protected]> <[email protected]>
 Sean Estabrooks <[email protected]>
 Sebastian Schuberth <[email protected]> <[email protected]>
 Stephen Boyd <[email protected]> <[email protected]>
 Steven Drake <[email protected]> <[email protected]>
 Steven Grimm <[email protected]> <[email protected]>
 +Steven Grimm <[email protected]> [email protected]
 Steven Walter <[email protected]> <[email protected]>
 Steven Walter <[email protected]> <[email protected]>
 Sven Verdoolaege <[email protected]> <[email protected]>