From 68ec412d923fdb345632cafe580d78da1f268966 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Thu, 13 Oct 2022 02:26:05 +0000 Subject: [PATCH 1/2] AUTHORS: Fix duplicate author George Katevenis had two names in git logs. Add a mailmap entry to force use of his full name. Signed-off-by: Brian Barrett (cherry picked from commit ce5d507901f1804d8dc6ed0fe91c316cc5cf025e) --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 392451565c4..f8f41117879 100644 --- a/.mailmap +++ b/.mailmap @@ -130,3 +130,5 @@ Samuel K. Gutierrez Tomislav Janjusic Tomislavj Janjusic William P. LePera + +George Katevenis From 0befaebc84b0064e0ea0e9f20ae7ecee4e32c89b Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Thu, 13 Oct 2022 02:32:03 +0000 Subject: [PATCH 2/2] AUTHORS: Unify my entry I had a slightly different name for commits from my personal email account, resulting in two AUTHORS entries. Update the name so that they are merged into one entry. Signed-off-by: Brian Barrett (cherry picked from commit d427ab0e343a5841e28df93a9ec58005afe43f99) --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index f8f41117879..959631ac71c 100644 --- a/.mailmap +++ b/.mailmap @@ -132,3 +132,5 @@ Tomislav Janjusic Tomislavj Janjusic George Katevenis + +Brian Barrett