From: Greg Hurrell via GitGitGadget <gitgitgadget@gmail.com>
Date: Tue, 02 Sep 2025 12:30:58 GMT
Subject: [PATCH] mailmap: consolidate multiple addresses into one
Message-ID: <pull.1966.git.1756816258606.gitgitgadget@gmail.com>

From: Greg Hurrell <greg.hurrell@datadoghq.com>

Merges contributions made from three different addresses:

- win@wincent.com (old address, initial contributions in 2007–2009)
- greg@hurrell.net (personal address matching full name, so this one is
  the "forever" address; contributions made starting in 2018)
- greg.hurrell@datadoghq.com (current work address, used for recent
  contributions)

Signed-off-by: Greg Hurrell <greg.hurrell@datadoghq.com>
---
    mailmap: consolidate multiple addresses into one

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1966%2Fwincent%2Fmailmap-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1966/wincent/mailmap-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1966

 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 96c2740fbb..afa21abbaa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -81,6 +81,8 @@ Fredrik Kuivinen <frekui@gmail.com> <freku045@student.liu.se>
 Frédéric Heitzmann <frederic.heitzmann@gmail.com>
 Garry Dolley <gdolley@ucla.edu> <gdolley@arpnetworks.com>
 Glen Choo <glencbz@gmail.com> <chooglen@google.com>
+Greg Hurrell <greg@hurrell.net> <greg.hurrell@datadoghq.com>
+Greg Hurrell <greg@hurrell.net> <win@wincent.com>
 Greg Price <price@mit.edu> <price@MIT.EDU>
 Greg Price <price@mit.edu> <price@ksplice.com>
 Heiko Voigt <hvoigt@hvoigt.net> <git-list@hvoigt.net>

base-commit: 6ad802182101d622e6a4132f48292ddfa79e2024
-- 
gitgitgadget