Junio C Hamano <gitster@xxxxxxxxx> writes: > I'd suggest using the lavabit address unless we hear the preferred > address from her, as the lavabit address was used in 5bf46841 > (git-gui: update Japanese translation, 2010-02-02), while the last > use of the bluebottle address was in 6762079a (Cloning from a repo > without "current branch", 2007-06-16). So with the above, and the four responses from long-lost friends, here is what I came up with. -- >8 -- Subject: .mailmap: update long-lost friends with multiple defunct addresses A handful of past contributors are recorded with multiple e-mail addresses, all of which are undeliberable. With a lot of help from Jonathan, we located all of them except for one. Update the found ones with their currently preferred address, and use the last known address to consolidate contributions by the lost person under a single entry. Helped-by: Stefan Beller <stefanbeller@xxxxxxxxxxxxxx> Helped-by: Jonathan Nieder <jrnieder@xxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- .mailmap | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index f7cc21e..7a5d0a6 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,8 @@ Alexey Shumkin <alex.crezoff@xxxxxxxxx> <Alex.Crezoff@xxxxxxxxx> Anders Kaseorg <andersk@xxxxxxx> <andersk@xxxxxxxxxxx> Anders Kaseorg <andersk@xxxxxxx> <andersk@xxxxxxx> Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxx> +Amos Waterland <apw@xxxxxxxxxx> <apw@xxxxxxxxxxxxxxxxxx> +Amos Waterland <apw@xxxxxxxxxx> <apw@xxxxxxxxxx> Ben Walton <bdwalton@xxxxxxxxx> <bwalton@xxxxxxxxxxxxxxxxxx> Bernt Hansen <bernt@xxxxxxxxx> <bernt@xxxxxxxxxxxxxxxxxxx> Brandon Casey <drafnel@xxxxxxxxx> <casey@xxxxxxxxxxxxxxx> @@ -34,6 +36,8 @@ Dan Johnson <computerdruid@xxxxxxxxx> Dana L. How <danahow@xxxxxxxxx> <how@xxxxxxxxxxxxxxxxxxxxxxx> Dana L. How <danahow@xxxxxxxxx> Dana How Daniel Barkalow <barkalow@xxxxxxxxxxxx> +Daniel Trstenjak <daniel.trstenjak@xxxxxxxxx> <daniel.trstenjak@xxxxxxxxx> +Daniel Trstenjak <daniel.trstenjak@xxxxxxxxx> <trsten@xxxxxxxxxxxxxxxxxxxx> David Brown <git@xxxxxxxxxx> <davidb@xxxxxxxxxxx> David D. Kilzer <ddkilzer@xxxxxxxxxx> David Kågedal <davidk@xxxxxxxxxxxxxx> @@ -68,11 +72,17 @@ J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxxxxxxx> J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxx> Jakub Narębski <jnareb@xxxxxxxxx> James Y Knight <jknight@xxxxxxxxxxxxxxx> <foom@xxxxxxxx> +# The 2 following authors are probably the same person, +# but both emails bounce. +Jason McMullan <jason.mcmullan@xxxxxxxxxxx> +Jason McMullan <mcmullan@xxxxxxxxxx> Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxxxx> Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxx> Jay Soffian <jaysoffian@xxxxxxxxx> <jaysoffian+git@xxxxxxxxx> Jeff King <peff@xxxxxxxx> <peff@xxxxxxxxxx> Jeff Muizelaar <jmuizelaar@xxxxxxxxxxx> <jeff@xxxxxxxxxxxx> +Jens Axboe <axboe@xxxxxxxxx> <axboe@xxxxxxx> +Jens Axboe <axboe@xxxxxxxxx> <jens.axboe@xxxxxxxxxx> Jim Meyering <jim@xxxxxxxxxxxx> <meyering@xxxxxxxxxx> Joachim Berdal Haga <cjhaga@xxxxxxxxxx> Johannes Schindelin <Johannes.Schindelin@xxxxxx> <johannes.schindelin@xxxxxx> @@ -144,7 +154,7 @@ Michele Ballabio <barra_cuda@xxxxxxxxxxxx> Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> <vmiklos@xxxxxxx> Namhyung Kim <namhyung@xxxxxxxxx> <namhyung.kim@xxxxxxx> Namhyung Kim <namhyung@xxxxxxxxx> <namhyung@xxxxxxxxxx> -Nanako Shiraishi <nanako3@xxxxxxxxxxxxxx> +Nanako Shiraishi <nanako3@xxxxxxxxxxx> <nanako3@xxxxxxxxxxxxxx> Nanako Shiraishi <nanako3@xxxxxxxxxxx> Nelson Elhage <nelhage@xxxxxxx> <nelhage@xxxxxxx> Nelson Elhage <nelhage@xxxxxxx> <nelhage@xxxxxxxxxxx> @@ -177,6 +187,8 @@ Robert Fitzsimons <robfitz@xxxxxxxx> Robert Shearman <robertshearman@xxxxxxxxx> <rob@xxxxxxxxxxxxxxx> Robert Zeh <robert.a.zeh@xxxxxxxxx> Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> <robin.rosenberg.lists@xxxxxxxxxx> +Rutger Nijlunsing <rutger.nijlunsing@xxxxxxxxx> <rutger@xxxxxxxxxx> +Rutger Nijlunsing <rutger.nijlunsing@xxxxxxxxx> <git@xxxxxxxxxxxxx> Ryan Anderson <ryan@xxxxxxxxxxxxxx> <rda@xxxxxxxxxx> Salikh Zakirov <salikh.zakirov@xxxxxxxxx> <Salikh.Zakirov@xxxxxxxxx> Sam Vilain <sam@xxxxxxxxxx> <sam.vilain@xxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html