summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-18 14:19:14 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-18 14:19:14 +0900
commitac86677afb12947efb32668a6ae3cf8eaa7a1627 (patch)
treedd4e60daf523baadc25b20e63bf5166f4f698e76
parentb0e5269c4eae3425be3cdc946c6414dfb886ae77 (diff)
parent99b7b687a637d77b9079d478daee98ba3acebcba (diff)
downloadgit-ac86677afb12947efb32668a6ae3cf8eaa7a1627.tar.gz
Merge branch 'rs/rs-mailmap' into maint
* rs/rs-mailmap: .mailmap: normalize name for René Scharfe
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index ab85e0d16d..224db83887 100644
--- a/.mailmap
+++ b/.mailmap
@@ -194,6 +194,7 @@ Philippe Bruhat <book@cpan.org>
Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
+René Scharfe <l.s.r@web.de> Rene Scharfe
Richard Hansen <rhansen@rhansen.org> <hansenr@google.com>
Richard Hansen <rhansen@rhansen.org> <rhansen@bbn.com>
Robert Fitzsimons <robfitz@273k.net>