From a2987c321e72029179dcfddc36e21334eb54099d Mon Sep 17 00:00:00 2001 From: Juuso Lapinlampi Date: Fri, 23 Oct 2015 12:08:08 +0000 Subject: Create Git .mailmap for git-shortlog(1) From git-shortlog(1) man page: > The .mailmap feature is used to coalesce together commits by the same > person in the shortlog, where their name and/or email address was > spelled differently. --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..ec66fd1 --- /dev/null +++ b/.mailmap @@ -0,0 +1,4 @@ +Eric Johansson +Eric Johansson nokonoko +Eliot Whalan pantsucat +Juuso Lapinlampi -- cgit v1.2.3 From 14066905f3c2554802d0dd422cf73cecb631f03d Mon Sep 17 00:00:00 2001 From: Juuso Lapinlampi Date: Fri, 23 Oct 2015 12:16:18 +0000 Subject: Fix Eliot Whalan's mailmap for contact@pantsu.cat Eliot has also contributed three commits with his name using contact@pantsu.cat. The match on pantsucat name is too specific. This groups those three commits to Eliot Whalan . --- .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index ec66fd1..26ea236 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,4 @@ Eric Johansson Eric Johansson nokonoko -Eliot Whalan pantsucat +Eliot Whalan Juuso Lapinlampi -- cgit v1.2.3 From c41aa889ba92360cbc7234dd4114b38d9baea42a Mon Sep 17 00:00:00 2001 From: Juuso Lapinlampi Date: Fri, 23 Oct 2015 12:21:16 +0000 Subject: Add alchimist to Git mailmap Although alchimist has not yet merged any commits to master as of this commit, it is anticipated to happen eventually after he's done working with his branches. Regardless, adding this makes sure git-shortlog(1) will display the up-to-date email address. --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 26ea236..cabbd3b 100644 --- a/.mailmap +++ b/.mailmap @@ -2,3 +2,4 @@ Eric Johansson Eric Johansson nokonoko Eliot Whalan Juuso Lapinlampi +alchimist cenci0 -- cgit v1.2.3