Note that official file format documentation is in git-shortlog(1), but provide a simple quick reference for the two types of entries currently used in this file.
A third type of entry was used previously, but this commit simplifies them into one of the two forms documented. Signed-off-by: Russell Bryant <russ...@ovn.org> --- .mailmap | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index a5eea0c..f01664e 100644 --- a/.mailmap +++ b/.mailmap @@ -1,13 +1,24 @@ +# See git-shortlog(1) for official documentation of this file format. +# +# Name <email> +# Use "Name" for any commit with address "<email>". This is useful when a person +# has commits using different spellings of their name, but with the same email +# address. +# +# Name <email> <email2> +# Use "Name" and "<email>" for any commit with the address "<email2>". This is useful +# when a person has used more than one email address. + Aaron Conole <acon...@redhat.com> <aa...@bytheb.org> Aaron Conole <acon...@redhat.com> <acon...@bytheb.org> Aaron Rosen <aaronoro...@gmail.com> <aro...@clemson.edu> Alex Wang <ee07b...@gmail.com> <al...@nicira.com> Alexey I. Froloff <ra...@raorn.name> <ra...@altlinux.org> +Alin Serdean <aserd...@cloudbasesolutions.com> Alin Serdean <aserd...@cloudbasesolutions.com> <aserdean at cloudbasesolutions.com> -Alin Serdean <aserd...@cloudbasesolutions.com> Alin Gabriel Sardean <aserd...@cloudbasesolutions.com> +Andy Zhou <az...@ovn.org> Andy Zhou <az...@ovn.org> <az...@nicira.com> Andy Zhou <az...@ovn.org> <az...@von.org> -Andy Zhou <az...@ovn.org> andy zhou <az...@ovn.org> Ansis Atteka <aatt...@ovn.org> <aatt...@nicira.com> Ansis Atteka <aatt...@ovn.org> <ansisatt...@gmail.com> Anupam Chanda <acha...@vmware.com> <acha...@nicira.com> @@ -25,8 +36,8 @@ Fischetti, Antonio <antonio.fische...@intel.com> Flavio Fernandes <fla...@flaviof.com> Flavio Leitner <f...@sysclose.org> <f...@redhat.com> Gal Sagie <gal.sa...@gmail.com> +Gurucharan Shetty <g...@ovn.org> Gurucharan Shetty <g...@ovn.org> <gshe...@nicira.com> -Gurucharan Shetty <g...@ovn.org> Guru Shetty <g...@ovn.org> Henry Mai <h...@nicira.com> <henry...@nicira.com> Hui Kang <ka...@us.ibm.com> <hkang.sun...@gmail.com> Ian Campbell <ian.campb...@citrix.com> <ian.campb...@citrix.com> @@ -51,7 +62,7 @@ Raju Subramanian <rsubraman...@nicira.com> Ralf Spenneberg <r...@spenneberg.net> Rami Rosen <ramir...@gmail.com> Ramu Ramamurthy <ramu.ramamur...@us.ibm.com> <ramu.ramamur...@gmail.com> -Robert Åkerblom-Andersson <robert....@gmail.com> Robert Åkerblom-Andersson <scorpi...@users.noreply.github.com> +Robert Åkerblom-Andersson <robert....@gmail.com> <scorpi...@users.noreply.github.com> Romain Lenglet <romain.leng...@oracle.com> <rleng...@vmware.com> Romain Lenglet <romain.leng...@oracle.com> <romain.leng...@berabera.info> Russell Bryant <russ...@ovn.org> <rbry...@redhat.com> -- 2.9.3 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
