From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1634816-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id E7CBC1581D3
	for <garchives@archives.gentoo.org>; Fri, 24 May 2024 19:28:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1943D2BC013;
	Fri, 24 May 2024 19:28:00 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id DED402BC013
	for <gentoo-commits@lists.gentoo.org>; Fri, 24 May 2024 19:27:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 2372D33C1EB
	for <gentoo-commits@lists.gentoo.org>; Fri, 24 May 2024 19:27:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 642461A28
	for <gentoo-commits@lists.gentoo.org>; Fri, 24 May 2024 19:27:57 +0000 (UTC)
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" <flow@gentoo.org>
Message-ID: <1716578874.f0a13c94836b6e29faeae727ad1007b321bec0f6.flow@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: /
X-VCS-Repository: repo/gentoo
X-VCS-Files: .mailmap
X-VCS-Directories: /
X-VCS-Committer: flow
X-VCS-Committer-Name: Florian Schmaus
X-VCS-Revision: f0a13c94836b6e29faeae727ad1007b321bec0f6
X-VCS-Branch: master
Date: Fri, 24 May 2024 19:27:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9ed4f042-210c-4c23-b319-f26b0cf42976
X-Archives-Hash: f3083fb0947b6a872081173a6c754aa9

commit:     f0a13c94836b6e29faeae727ad1007b321bec0f6
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Fri May 24 17:49:36 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri May 24 19:27:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a13c94

.mailmap: map my old email addresses and name

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/36806
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

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

diff --git a/.mailmap b/.mailmap
index 9fc2973bdf9e..5d99d931e7b7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,6 +12,8 @@ Andrew Ammerlaan <andrewammerlaan@gentoo.org> <andrew.ammerlaan@ru.nl>
 Andrew Ammerlaan <andrewammerlaan@gentoo.org> <nowa-ammerlaan@riseup.net>
 Arsen Arsenović <arsen@gentoo.org> <arsen@aarsen.me>
 Christopher Bayliss <cjbdev@icloud.com> <cjb@cjb.sh>
+Eric Joldasov <bratishkaerik@landless-city.net> BratishkaErik <bratishkaerik@getgoogleoff.me>
+Eric Joldasov <bratishkaerik@landless-city.net> <bratishkaerik@getgoogleoff.me>
 Florian Schmaus <flow@gentoo.org> <flo@geekplace.eu>
 Ionen Wolkens <ionen@gentoo.org> <sudinave@gmail.com>
 Joonas Niilola <juippis@gentoo.org> <juippis@gmail.com>