Commit Graph

43 Commits

Author SHA1 Message Date
Zbigniew Jędrzejewski-Szmek
140d6853e9 mailmap: "reduce contributor count by 13"
This merges the counts for a few people who existed with and without accents,
or with different capitalizations, and suffixes. Also, stop overriding
NeilBrown's spelling of the name.

Note: IIUC, we have two Luca Bruno's: lucab@debian.net is not the same as the
other Luca BRUNO who works on coreos.

@@ -386 +385,0 @@
-     2	Damjan Georgievski
@@ -401 +399,0 @@
-     1	Daniel Berrange
@@ -425 +423 @@
-    11	Daniel P. Berrangé
+    12	Daniel P. Berrangé
@@ -888 +885,0 @@
-     1	Jiri Pirko
@@ -891 +888 @@
-     1	Jiří Pírko
+     2	Jiří Pírko
@@ -1105 +1102 @@
-    12	Luca BRUNO
+    18	Luca BRUNO
@@ -1107 +1104 @@
-     8	Luca Bruno
+     2	Luca Bruno
@@ -1160,2 +1157 @@
-     1	Marc-Andre Lureau
-    17	Marc-André Lureau
+    18	Marc-André Lureau
@@ -1313,2 +1309 @@
-    31	Michal Sekletar
-   168	Michal Sekletár
+   199	Michal Sekletár
@@ -1383,3 +1378 @@
-     2	Neal Gompa
-     1	Neal Gompa (ニール・ゴンパ)
-    12	Neil Brown
+     3	Neal Gompa (ニール・ゴンパ)
@@ -1387,0 +1381 @@
+    12	NeilBrown
@@ -1494,2 +1488 @@
-     1	Perry Yuan
-     1	Perry.Yuan
+     3	Perry Yuan
@@ -1941,2 +1934 @@
-     2	Viktar Vauchkevich
-     2	Viktar Vaŭčkievič
+     4	Viktar Vaŭčkievič
@@ -2016,2 +2008 @@
-     1	Yao Wei
-     1	Yao Wei (魏銘廷)
+     2	Yao Wei (魏銘廷)
@@ -2145 +2135,0 @@
-     1	gdamjan
@@ -2256 +2245,0 @@
-     1	perry_yuan
@@ -2331 +2320 @@
-    18	Дамјан Георгиевски
+    21	Дамјан Георгиевски
2023-08-16 12:49:42 +02:00
Lennart Poettering
eade959b90 NEWS: more preparation for 254-rc1 2023-07-06 11:16:16 +02:00
Zbigniew Jędrzejewski-Szmek
75e53df7e3 mailmap: two more names 2021-03-30 13:17:58 +02:00
Lennart Poettering
264f1e5c3d mailmap: merge Weblate bot commiter into one 2021-03-17 16:53:10 +01:00
Zbigniew Jędrzejewski-Szmek
8b25484af3 NEWS: update contributors list for v246-pre 2020-07-23 17:30:54 +02:00
Zbigniew Jędrzejewski-Szmek
72e5190878 NEWS: update contributors list for v246-rc 2020-07-08 17:33:46 +02:00
Zbigniew Jędrzejewski-Szmek
9c4d3d7968 NEWS: update contributors list 2020-03-03 08:31:06 +01:00
Zbigniew Jędrzejewski-Szmek
6df086019c mailmap: update 2019-11-22 09:33:40 +01:00
Zbigniew Jędrzejewski-Szmek
e48a1e3423 mailmap: add entry to fix authorship of commit
471cffcfb0 was committed on a debug VM where I
didn't have git set up properly.
2019-10-21 15:10:58 +02:00
Lennart Poettering
e67ccb54a2 update .mailmap 2019-04-02 17:31:00 +02:00
Lennart Poettering
d0f7174963 NEWS: update for final v241 2019-02-14 10:58:06 +01:00
Lennart Poettering
40f714d8f8 sort .mailmap alphabetically 2018-12-18 12:55:00 +01:00
Lennart Poettering
a0795d48f2 update .mailmap a bit from v240 contributions 2018-12-18 12:53:58 +01:00
Lennart Poettering
bb6f071f5a update NEWS contributors list again 2018-06-20 13:32:57 +02:00
Lennart Poettering
61d0025d5a NEWS: update contributor list to current git 2018-06-15 12:07:57 +09:00
Lennart Poettering
ec53d48c41 NEWS: some .mailmap work to clean up contributors list 2018-06-13 14:20:03 +02:00
Zbigniew Jędrzejewski-Szmek
72dea211d4 mailmap: one more person 2018-03-05 17:21:09 +01:00
Zbigniew Jędrzejewski-Szmek
1288b5405f mailmap: one more person
For a083b4875e.
2018-02-14 09:43:49 +01:00
Lennart Poettering
95894b91b4 NEWS: start putting together an entry for v237 2018-01-25 13:21:00 +01:00
Lennart Poettering
ea2a3c9e50 NEWS: update NEWS again, and prepare for a release tomorrow 2017-12-14 17:29:30 +01:00
Lennart Poettering
634032cfa5 mailmap: add more names from the v236 cycle
Let's clean up after github's "squash" feature…
2017-12-11 16:05:40 +01:00
Lennart Poettering
76451c1db0 update .mailmap a bit more 2017-10-05 17:39:50 +02:00
Zbigniew Jędrzejewski-Szmek
608f70e6b4 Update mailmap and contributor list (#7006)
Also fix typo (by using a word that is a better git anyway.)
2017-10-05 15:41:33 +02:00
Zbigniew Jędrzejewski-Szmek
8baa95250b mailmap: add entry to fix encoding issues 2017-09-15 17:18:29 +02:00
Zbigniew Jędrzejewski-Szmek
0d372efadf mailmap: add entry 2017-07-18 10:04:44 -04:00
Lennart Poettering
184d2c1576 NEWS: tweak contributors list a bit
Let's add more .mailmap entries to clean up GitHub's mess.
2017-07-03 11:19:20 +02:00
Zbigniew Jędrzejewski-Szmek
44abc32307 mailmap: some additions for recent commits 2017-06-30 13:23:32 -04:00
Zbigniew Jędrzejewski-Szmek
9e13621db5 mailmap: add entries for recent commits from github 2017-05-30 21:36:27 -04:00
John Paul Adrian Glaubitz
d82c4b9a7b mailmap: add entry for John Paul Adrian Glaubitz (#6015) 2017-05-23 09:22:44 -04:00
Lennart Poettering
a2b53448e4 update NEWS for v233 (#5503) 2017-03-01 11:21:29 -05:00
Lennart Poettering
d08ee7cbea start putting together a NEWS entry for 233 2017-02-21 13:59:23 +01:00
Lennart Poettering
07393b6ea9 NEWS: add contributor list to news file
Unfortunately, github drops the original commiter when a PR is "squashed" (even
if it is only a single commit) and replaces it with some rubbish
github-specific user id. Thus, to make the contributors list somewhat useful,
update the .mailmap file and undo all the weirdness github applied there.
2016-11-02 15:52:57 -06:00
Lennart Poettering
fec46f48b6 NEWS: update mailmap to bring NEWS and "make git-contrib" in line
Let's make sure that "make git-contrib" prints a useful contributors list
directly useful for NEWS and fixes up contributors's IDs a bit.
2016-07-25 15:03:46 +02:00
Lennart Poettering
1137c73b40 mailmap: add a few more names
Let's do something about my OCD and map a numbre of commiters to proper names.
2016-07-22 20:16:58 +02:00
Lennart Poettering
28c85daf0a NEWS: add more stuff, and reorder things a bit 2015-11-13 13:59:50 +01:00
Lennart Poettering
e49b5aada0 prepare NEWS 2014-02-18 02:51:47 +01:00
Stefan Beller
9dddaedfcc Update .mailmap file
This commit updates email addresses of people, who are already in the
.mailmap file, so I'd assume they have sorted out their viewpoint on
privacy within the .mailmap file.

The entries for this commit have been produced using:
        # Finding out duplicates by comparing email addresses:
        git shortlog -sne |awk '{ print $NF }' |sort |uniq -d

        # Finding out duplicates by comparing names:
        git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
2014-01-05 00:43:22 -05:00
Zbigniew Jędrzejewski-Szmek
decc5aa90d Add a few entries to .mailmap 2013-01-29 21:31:41 -05:00
Zbigniew Jędrzejewski-Szmek
89db26a263 Update .mailmap 2013-01-07 11:28:30 -05:00
Lennart Poettering
0790b9fed4 update mailmap 2012-08-09 12:52:49 +02:00
Martin Pitt
b650827875 update mailmap for Martin Pitt 2012-05-14 13:06:20 +02:00
Kay Sievers
af7c2d6c54 update mailmap 2012-04-13 03:47:52 +02:00
Lennart Poettering
ac49a39714 git: add .mailmap 2011-05-19 14:06:02 +02:00