diff options
| author | Julian Andres Klode <jak@debian.org> | 2022-03-21 08:05:11 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2022-03-21 08:05:11 +0000 |
| commit | 70f0f4e61169bfbfe2c3eef82714eec4450ffe38 (patch) | |
| tree | e0e71dae931f9b0ae8ebec9dd0e608357c1f1d7f | |
| parent | a0e16ddd7b274bf6b1383873315020f215e6f67a (diff) | |
| parent | 39507ca044d34d614127773d564b045caae98df4 (diff) | |
Merge branch 'pu/mailmap' into 'main'
Update .mailmap
See merge request apt-team/apt!230
| -rw-r--r-- | .mailmap | 26 |
1 files changed, 18 insertions, 8 deletions
@@ -1,18 +1,28 @@ -# Unify user identities -Christian Perrier <bubulle@debian.org> -<ian@davenant.greenend.org.uk> <ian@anarres> -<ian@davenant.greenend.org.uk> <ian@liberator> +# Aliases +<mvo@ubuntu.com> <michael.vogt@ubuntu.com> + +# Use real mail addresses +<ijackson@chiark.greenend.org.uk> <ian@anarres> +<ijackson@chiark.greenend.org.uk> <ian@liberator> <jackyf@debian.org> <jackyf@1501-debian> Michael Vogt <mvo@debian.org> <egon@debian-vm> <mvo@debian.org> <egon@bottom> <mvo@debian.org> <egon@debian-devbox> <mvo@debian.org> <egon@pop> <mvo@debian.org> <egon@tas> -<michael.vogt@ubuntu.com> <mvo@ubuntu.com> -# Name changes -Peter Krefting <peterk@debian.org> -# Email as user name + +# Very broken names Christian Perrier <bubulle@debian.org> bubulle@debian.org <> Julian Andres Klode <jak@debian.org> jak@debian.org <> Loïc Minier <lool@dooz.org> lool@dooz.org <> Martin Pitt <martin@piware.de> martin@piware.de <> + +# Spell names properly +Christian Perrier <bubulle@debian.org> +Joe Hansen <joedalton2@yahoo.dk> +Johannes Schauer Marin Rodrigues <j.schauer@email.de> +Johannes Schauer Marin Rodrigues <josch@debian.org> +Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Michael Vogt <mvo@debian.org> +Peter Krefting <peterk@debian.org> +Trần Ngọc Quân <vnwildman@gmail.com> |