From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1601047-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 6171515808B
	for <garchives@archives.gentoo.org>; Sat, 17 Feb 2024 04:25:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id AA93EE2A01;
	Sat, 17 Feb 2024 04:25:55 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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 pigeon.gentoo.org (Postfix) with ESMTPS id 8D8FAE2A01
	for <gentoo-commits@lists.gentoo.org>; Sat, 17 Feb 2024 04:25:55 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 85AA333EB78
	for <gentoo-commits@lists.gentoo.org>; Sat, 17 Feb 2024 04:25:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E75C14AA
	for <gentoo-commits@lists.gentoo.org>; Sat, 17 Feb 2024 04:25:53 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1708143944.aa4b05d520ebfd044d8a852d7d48937ab160f48d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: /
X-VCS-Repository: repo/gentoo
X-VCS-Files: .mailmap
X-VCS-Directories: /
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: aa4b05d520ebfd044d8a852d7d48937ab160f48d
X-VCS-Branch: master
Date: Sat, 17 Feb 2024 04:25:53 +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: 0837caa0-bd81-4aef-a597-a338722c391b
X-Archives-Hash: 7d8a01a5f685e4effd1c74378e2b14e3

commit:     aa4b05d520ebfd044d8a852d7d48937ab160f48d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 04:01:53 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 04:25:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa4b05d5

.mailmap: init

As proposed at https://marc.info/?l=gentoo-dev&m=170781377903495&w=2.

"""
There's a few reasons:
* We should accurately map pre-developer-status contributions.
  For example, it'd be nice if sam <AT> cmpct.info was mapped correctly
  into sam <AT> gentoo.org when doing git blame.

  We know sam <AT> cmpct.info and sam@gentoo.org are the same person, it
  feels coherent to tell git that via the mechanism intended for it.

* It's useful for when people retire as well. Not that I plan on going
  anywhere any time soon (sorry!), but this is both a useful way for
  people to better "retain credit" *and* for e.g. 'git blame' to work
  better if they then come back as a contributor but not a developer, which
  happens on occasion, or if they occasionally contribute with a
  different email address (we have this for some devs who contribute
  under a "work context" too).

* It allows people to have git respecting changing their name for
  various reasons (e.g. we've had contributors start using their real name
  and vice-versa over the years).
"""

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..f7249804e12d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+# Old/new developers can be added here to map their contributions accurately
+# before joining and after retiring, as well as the usual uses of .mailmap.
+# See gitmailmap(5) for format details.
+Sam James <sam@gentoo.org> Sam James (sam_c) <sam@cmpct.info>
+Sam James <sam@gentoo.org> Sam James (sam_c) <sam@gentoo.org>