summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-10 13:52:54 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-10 13:52:54 -0700
commitefa615ba089e88c0d2645f444373751de0529214 (patch)
treea08456ab6dbf43dcd382a50fcc4589ea66d5d67a /.mailmap
parentgitweb: choose appropriate view for file type if a= parameter missing (diff)
parent.mailmap: add some aliases (diff)
downloadtgif-efa615ba089e88c0d2645f444373751de0529214.tar.xz
Merge branch 'maint'
* maint: .mailmap: add some aliases SPECIFYING RANGES typo fix: it it => it is git-clone: don't get fooled by $PWD Fix documentation of tag in git-fast-import.txt
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 17e89af118..4e0615e9be 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,7 +35,11 @@ Shawn O. Pearce <spearce@spearce.org>
Theodore Ts'o <tytso@mit.edu>
Tony Luck <tony.luck@intel.com>
Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
+Uwe Kleine-König <Uwe_Zeisberger@digi.com>
+Uwe Kleine-König <uzeisberger@io.fsforth.de>
+Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Ville Skyttä <scop@xemacs.org>
YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
anonymous <linux@horizon.com>
anonymous <linux@horizon.net>
+Dana L. How <how@deathvalley.cswitch.com>