Documentation/git-merge.txt: Partial rewrite of How Merge Works
[git/git.git] / .mailmap
CommitLineData
2cf0223b
NP
1#
2# This list is used by git-shortlog to fix a few botched name translations
3# in the git archive, either because the author's full name was messed up
4# and/or not always written the same way, making contributions from the
5# same person appearing not to be so.
6#
7
8Aneesh Kumar K.V <aneesh.kumar@gmail.com>
9758ecde 9Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
2cf0223b 10Chris Shoemaker <c.shoemaker@cox.net>
65c6aca4
JH
11Dana L. How <danahow@gmail.com>
12Dana L. How <how@deathvalley.cswitch.com>
2cf0223b
NP
13Daniel Barkalow <barkalow@iabervon.org>
14David Kågedal <davidk@lysator.liu.se>
15Fredrik Kuivinen <freku045@student.liu.se>
16H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
17H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
18H. Peter Anvin <hpa@trantor.hos.anvin.org>
19Horst H. von Brand <vonbrand@inf.utfsm.cl>
cf5c51ef 20Jay Soffian <jaysoffian+git@gmail.com>
2cf0223b
NP
21Joachim Berdal Haga <cjhaga@fys.uio.no>
22Jon Loeliger <jdl@freescale.com>
23Jon Seymour <jon@blackcubes.dyndns.org>
94008931 24Junio C Hamano <junio@twinsun.com>
2cf0223b
NP
25Karl Hasselström <kha@treskal.com>
26Kent Engstrom <kent@lysator.liu.se>
2cf0223b 27Lars Doelle <lars.doelle@on-line ! de>
65c6aca4 28Lars Doelle <lars.doelle@on-line.de>
74f6b03c 29Li Hong <leehong@pku.edu.cn>
2cf0223b
NP
30Lukas Sandström <lukass@etek.chalmers.se>
31Martin Langhoff <martin@catalyst.net.nz>
94008931 32Michael Coleman <tutufan@gmail.com>
2342c4ee 33Michele Ballabio <barra_cuda@katamail.com>
14a4091c 34Nanako Shiraishi <nanako3@bluebottle.com>
2cf0223b
NP
35Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
36Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
37René Scharfe <rene.scharfe@lsrfire.ath.cx>
38Robert Fitzsimons <robfitz@273k.net>
509b4d73 39Sam Vilain <sam@vilain.net>
2cf0223b
NP
40Santi Béjar <sbejar@gmail.com>
41Sean Estabrooks <seanlkml@sympatico.ca>
42Shawn O. Pearce <spearce@spearce.org>
79f3368d 43Steven Grimm <koreth@midwinter.com>
5e207b4b 44Theodore Ts'o <tytso@mit.edu>
2cf0223b 45Tony Luck <tony.luck@intel.com>
b722b958 46Uwe Kleine-König <Uwe_Zeisberger@digi.com>
463e8c76 47Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
b722b958 48Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
65c6aca4
JH
49Uwe Kleine-König <uzeisberger@io.fsforth.de>
50Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
2cf0223b 51Ville Skyttä <scop@xemacs.org>
94008931 52William Pursell <bill.pursell@gmail.com>
2cf0223b
NP
53YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
54anonymous <linux@horizon.com>
55anonymous <linux@horizon.net>