doc: mention new timeout short options in NEWS
[coreutils.git] / .mailmap
blobdc04853c3a10b76a9474fbcea444d304352b4488
1 # Map git author names and email addresses to canonical/preferred form.
2 <jim@meyering.net> <meyering@fb.com>
3 <jim@meyering.net> <meyering@iou.iou>
4 <jim@meyering.net> <meyering@redhat.com>
5 <jim@meyering.net> <meyering@rho.meyering.net>
6 <jim@meyering.net> <meyering@vm.meyering.net.localdomain>
7 Paul Eggert <eggert@cs.ucla.edu> <eggert@penguin.cs.ucla.edu>
8 Paul Eggert <eggert@cs.ucla.edu> <eggert@CS.UCLA.EDU>
9 <eggert@cs.ucla.edu> <eggert@twinsun.com>
11 # Evan's two changes listed my email address.
12 Evan Hunt <ethanol@armory.com> Evan Hunt <jim@meyering.net>
14 <P@draigBrady.com> <P@draigBrady.com  (trivial change)>
15 Pádraig Brady <P@draigBrady.com>
16 <chen.guo.0625@gmail.com> <chenguo4@yahoo.com>
17 <chen.guo.0625@gmail.com> <chenguo4@ucla.edu>
18 <schwab@linux-m68k.org> <schwab@suse.de>
19 <aurel32@debian.org> <aurelien@aurel32.net>
20 <bob@proulx.com> <rwp@fc.hp.com>
21 <bkorb@gnu.org> <bkorb@veritas.com>
22 <bruno@clisp.org> <haible@clisp.cons.org>
23 <eblake@redhat.com> <ebb9@byu.net>
24 <jrv@debian.org> <jrvz@comcast.net>
25 <dave.anglin@nrc.ca> <dave@hiauly1.hia.nrc.ca>
26 <psfales@alcatel-lucent.com> <psfales@lucent.com>
27 <karl@gnu.org> <karl@freefriends.org>
28 <stephane.raimbault@gmail.com> <stephane.raimbault@makina-corpus.com>
29 <jarkko.sakkinen@iki.fi> <jarkko.sakkinen@linux.intel.com>
30 <tobias@stoeckmann.org> <tobias@bugol.de>
31 <cjwatson@debian.org> <cjwatson@ubuntu.com>
33 # Prefer spelled-out middle name and its address.
34 Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no>
36 # Had email as name.
37 Dan Jacobson <jidanni@jidanni.org> jidanni@jidanni.org <jidanni@jidanni.org>
39 # Consolidate names of same email address.
40 Jeff Liu <jeff.liu@oracle.com> jeff.liu <jeff.liu@oracle.com>
41 Jeff Liu <jeff.liu@oracle.com> Jie Liu <jeff.liu@oracle.com>
43 # Convert to latin1 for a better 'THANKS' sort order.
44 Aleksej Shilin <rootlexx@mail.ru> Алексей Шилин <rootlexx@mail.ru>