From: Junio C Hamano Date: Wed, 21 Nov 2018 13:57:47 +0000 (+0900) Subject: Merge branch 'jn/mailmap-update' into maint X-Git-Tag: v2.19.2~52 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1814e02282860a85b0ca85092df08b4788103da?hp=-c Merge branch 'jn/mailmap-update' into maint The mailmap file update. * jn/mailmap-update: mailmap: consistently normalize brian m. carlson's name --- f1814e02282860a85b0ca85092df08b4788103da diff --combined .mailmap index f165222a78,b28eeeb84f..bef3352b0d --- a/.mailmap +++ b/.mailmap @@@ -25,7 -25,7 +25,7 @@@ Ben Walton Bernt Hansen Brandon Casey - brian m. carlson Brian M. Carlson + brian m. carlson brian m. carlson Bryan Larsen Bryan Larsen @@@ -35,13 -35,11 +35,13 @@@ Chris Wright Christian Couder Christian Stimming +Christopher Díaz Riveros Christopher Diaz Riveros Csaba Henk Dan Johnson Dana L. How Dana L. How Dana How Daniel Barkalow +Daniel Knittl-Frank knittl Daniel Trstenjak Daniel Trstenjak David Brown @@@ -59,7 -57,6 +59,7 @@@ Eric S. Raymond Erik Faye-Lund Eyvind Bernhardsen +Fangyi Zhou Zhou Fangyi Florian Achleitner Franck Bui-Huu Frank Lichtenheld @@@ -89,8 -86,6 +89,8 @@@ Jason McMullan Jason Riedy Jay Soffian +Jean-Noël Avila Jean-Noel Avila +Jean-Noël Avila Jean-Noël AVILA Jeff King Jeff Muizelaar Jens Axboe @@@ -154,7 -149,6 +154,7 @@@ Matt Draisey Matt McCutchen Matthias Kestenholz +Matthias Rüster Matthias Ruester Matthias Urlichs Matthias Urlichs Michael Coleman @@@ -219,8 -213,6 +219,8 @@@ Sean Estabrooks Seth Falcon Shawn O. Pearce +Wei Shuyu Shuyu Wei +Sidhant Sharma Sidhant Sharma [:tk] Simon Hausmann Simon Hausmann Stefan Beller @@@ -261,8 -253,7 +261,8 @@@ Uwe Kleine-König Uwe Kleine-König Ville Skyttä -Vitaly "_Vi" Shukela +Vitaly "_Vi" Shukela +Vitaly "_Vi" Shukela Vitaly _Vi Shukela W. Trevor King William Pursell YONETANI Tomokazu