summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-01 12:41:41 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-01 12:41:41 -0700
commit22930a0a8d21bf15a9b2582b262b5de2f3d106a2 (patch)
treeffc0e9725c5a09ecfe144b19cb0f7805e700153f
parent693502087e3a3190ffb11886989d52079e05412d (diff)
parent15dd5ffb543848c914c2f3dabfedb1816bd2474d (diff)
downloadgit-22930a0a8d21bf15a9b2582b262b5de2f3d106a2.tar.gz
Merge branch 'sb/mailmap-merijn-brand'
* sb/mailmap-merijn-brand: .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 48d7acf013..345cce698a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,6 +24,7 @@ Eric S. Raymond <esr@thyrsus.com>
Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
Fredrik Kuivinen <freku045@student.liu.se>
Frédéric Heitzmann <frederic.heitzmann@gmail.com>
+H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
H. Peter Anvin <hpa@trantor.hos.anvin.org>