|
1 | 1 | # Prevent git from showing duplicate names with commands like "git shortlog" |
2 | 2 | # See the manpage of git-shortlog for details. |
3 | 3 | # The syntax is: |
4 | | -# Name that should be used <email that should be used> Bad name <bad email> |
5 | 4 | # |
6 | | -# You can skip Bad name if it is the same as the one that should be used, and is unique. |
| 5 | +# Good Name <good email> [[Bad Name] <bad email>] |
| 6 | +# |
| 7 | +# If multiple names are mapped to the good email, a line without any bad |
| 8 | +# emails will consolidate these names. |
| 9 | +# Likewise, any name mapped to a bad email will be converted to the good name. |
| 10 | +# |
| 11 | +# A contributor with three emails and inconsistent names could be mapped like this: |
| 12 | +# |
| 13 | +# Good Name <email1> |
| 14 | +# Good Name <email1> <email2> |
| 15 | +# Good Name <email1> <email3> |
| 16 | +# |
| 17 | +# If a contributor uses an email that is not unique to them, you will need their |
| 18 | +# name. |
| 19 | +# |
| 20 | +# Good Name <good email> |
| 21 | +# Good Name <good email> Good Name <ambiguous email> |
7 | 22 | # |
8 | 23 | # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u |
9 | 24 | # gives no duplicates. |
10 | | -Alexandre Gramfort < [email protected]> Alexandre Gramfort < [email protected]> |
| 25 | + |
11 | 26 | |
12 | | - |
13 | | -B. Nolan Nichols < [email protected]> Nolan Nichols <[email protected]> |
14 | | - |
15 | | - |
16 | | - |
| 27 | + |
| 28 | +B. Nolan Nichols < [email protected]> |
| 29 | +Basile Pinsard < [email protected]> |
| 30 | + |
| 31 | + |
17 | 32 | Benjamin C Darwin < [email protected]> |
18 | | - |
| 33 | +Bertrand Thirion < [email protected]> |
19 | 34 | |
20 | | -Christian Haselgrove < [email protected]> Christian Haselgrove < [email protected]> |
21 | | -Christopher J. Markiewicz < [email protected]> Chris Johnson < [email protected]> |
22 | | -Christopher J. Markiewicz < [email protected]> Chris Markiewicz < [email protected]> |
23 | | -Christopher J. Markiewicz < [email protected]> Chris Markiewicz < [email protected]> |
24 | | -Christopher J. Markiewicz < [email protected]> Christopher J. Markiewicz < [email protected]> |
25 | | -Christopher J. Markiewicz < [email protected]> Christopher J. Markiewicz < [email protected]> |
26 | | - |
27 | | - |
28 | | -Demian Wassermann < [email protected]> Demian Wassermann < [email protected]> |
| 35 | + |
| 36 | +Christopher J. Markiewicz < [email protected]> |
| 37 | + |
| 38 | + |
| 39 | +Cindee Madison < [email protected]> |
| 40 | + |
29 | 41 | Dimitri Papadopoulos Orfanos < [email protected]> < [email protected]> |
30 | 42 | Dimitri Papadopoulos Orfanos < [email protected]> < [email protected]> |
31 | | - |
32 | | - |
| 43 | + |
33 | 44 | |
34 | | -Fernando Pérez-García < [email protected]> Fernando < [email protected]> |
35 | | -Félix C. Morency < [email protected]> Felix C. Morency < [email protected]> |
36 | | -Félix C. Morency < [email protected]> Félix C. Morency < [email protected]> |
37 | | -Gael Varoquaux < [email protected]> GaelVaroquaux < [email protected]> |
38 | | -Gregory R. Lee < [email protected]> Gregory R. Lee < [email protected]> |
39 | | -Ian Nimmo-Smith < [email protected]> Ian Nimmo-Smith < [email protected]> |
40 | | - |
41 | | - |
| 45 | +Fernando Pérez-García < [email protected]> |
| 46 | + |
| 47 | +Gael Varoquaux < [email protected]> |
| 48 | + |
| 49 | + |
| 50 | +Jaakko Leppäkangas < [email protected]> |
42 | 51 | |
43 | | -Jakub Kaczmarzyk < [email protected]> |
44 | 52 | |
45 | | -Jasper J.F. van den Bosch < [email protected]> Jasper <[email protected]> |
46 | | -Jean-Baptiste Poline < [email protected]> jbpoline <[email protected]> |
| 53 | +Jasper J.F. van den Bosch < [email protected]> |
| 54 | +Jean-Baptiste Poline < [email protected]> |
47 | 55 | |
48 | | -Jon Haitz Legarreta < [email protected]> Jon Haitz Legarreta Gorroño < [email protected]> |
49 | | -Jonathan Daniel < [email protected]> |
| 56 | +Jon Haitz Legarreta < [email protected]> |
50 | 57 | |
51 | | - |
52 | | - |
53 | | -Konstantinos Raktivan < [email protected]> constracti <[email protected]> |
54 | | -Krish Subramaniam < [email protected]> Krish Subramaniam < [email protected]> |
| 58 | + |
| 59 | + |
| 60 | +Konstantinos Raktivan < [email protected]> |
| 61 | + |
55 | 62 | Krzysztof J. Gorgolewski < [email protected]> |
56 | 63 | |
57 | | -Marc-Alexandre Côté < [email protected]> Marc-Alexandre Cote <[email protected]> |
| 64 | +Marc-Alexandre Côté < [email protected]> |
58 | 65 | Mathias Goncalves < [email protected]> |
59 | 66 | |
60 | | -Matthew Cieslak < [email protected]> Matt Cieslak < [email protected]> |
| 67 | + |
| 68 | +Matthew Cieslak < [email protected]> |
61 | 69 | Michael Hanke < [email protected]> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2> |
62 | 70 | |
63 | | -Michiel Cottaar < [email protected]> |
64 | 71 | |
65 | 72 | |
66 | | - |
67 | | - |
| 73 | + |
| 74 | +Oliver P. Hinds < [email protected]> |
68 | 75 | |
69 | 76 | |
70 | | - |
| 77 | + |
| 78 | + |
71 | 79 | Roberto Guidotti < [email protected]> |
72 | 80 | |
73 | | -Satrajit Ghosh < [email protected]> Satrajit Ghosh < [email protected]> |
74 | | - |
| 81 | + |
| 82 | + |
75 | 83 | Stephan Gerhard < [email protected]> Stephan Gerhard < [email protected]> |
76 | | - |
77 | | -Venkateswara Reddy Reddam < [email protected]> R3DDY97 < [email protected]> |
| 84 | + |
| 85 | +Venkateswara Reddy Reddam < [email protected]> |
| 86 | +Yaroslav O. Halchenko < [email protected]> |
78 | 87 | Yaroslav O. Halchenko < [email protected]> <yoh-guest@82381867-18eb-0310-98a2-9474e637aba2> |
79 | | -Yaroslav O. Halchenko < [email protected]> Yaroslav Halchenko < [email protected]> |
|
0 commit comments