[libvirt] [PATCH 4/5] mailmap: Consolidate current and past maintainers

We can't do this in general, but for maintainers we have the data in AUTHORS.in to use as a source of truth. This gets rid of several duplicated lines in the generated AUTHORS file. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .mailmap | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.mailmap b/.mailmap index edea456268..913395b89c 100644 --- a/.mailmap +++ b/.mailmap @@ -38,6 +38,10 @@ <zhlcindy(a)linux.vnet.ibm.com&gt; <zhlcindy(a)gmail.com&gt; <serge.hallyn(a)canonical.com&gt; <serue(a)us.ibm.com&gt; <pritesh.kothari(a)sun.com&gt; <Pritesh.Kothari(a)Sun.COM&gt; +&lt;cbosdonnat(a)suse.com&gt; <cedric.bosdonnat(a)free.fr&gt; +&lt;mnestratov(a)virtuozzo.com&gt; <mnestratov(a)parallels.com&gt; +&lt;nshirokovskiy(a)virtuozzo.com&gt; <nshirokovskiy(a)parallels.com&gt; +&lt;jyang(a)redhat.com&gt; <osier(a)yunify.com&gt; # Name consolidation: # Preferred author spelling <preferred email> @@ -58,9 +62,13 @@ Philipp Hahn <hahn(a)univention.de&gt; Pritesh Kothari <pritesh.kothari(a)sun.com&gt; Wang Yufei (James) <james.wangyufei(a)huawei.com&gt; Deepak C Shetty <dpkshetty(a)gmail.com&gt; +Dave Allan <dallan(a)redhat.com&gt; +Richard W.M. Jones <rjones(a)redhat.com&gt; # Non-trivial consolidation: # see git documentation for information about the format Daniel P. Berrangé <berrange(a)redhat.com&gt; Daniel P. Berrangé <berrange(a)redhat.com&gt; <dan(a)berrange.com&gt; +Michal Prívozník <mprivozn(a)redhat.com&gt; +Michal Prívozník <mprivozn(a)redhat.com&gt; <miso.privoznik(a)gmail.com&gt; Marco Bozzolan <bozzolan(a)gmail.com&gt; <redshift(a)gmx.com&gt; -- 2.17.1