From eb9a9c56422fb021cdaba4e0bbb22c7b42e3baaf Mon Sep 17 00:00:00 2001 From: Oliver Ruebel Date: Fri, 27 Oct 2023 20:02:33 -0700 Subject: [PATCH] Add/mailmap (#976) --- .mailmap | 4 ++++ CHANGELOG.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..8babafefd --- /dev/null +++ b/.mailmap @@ -0,0 +1,4 @@ +# Mailmap is used by git to map author/committer names and/or E-Mail addresses +# See https://git-scm.com/docs/gitmailmap for details +Ben Dichter +Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> diff --git a/CHANGELOG.md b/CHANGELOG.md index fcb4908f7..35e545bb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Bug fixes - Updated custom class generation to handle specs with fixed values and required names. @rly [#800](https://github.com/hdmf-dev/hdmf/pull/800) - Fixed custom class generation of `DynamicTable` subtypes to set attributes corresponding to column names for correct write. @rly [#800](https://github.com/hdmf-dev/hdmf/pull/800) +- Added a `.mailmap` file to correct mapping of names/emails in git logs. @oruebel [#976](https://github.com/hdmf-dev/hdmf/pull/976) ## HDMF 3.10.0 (October 3, 2023)