.mailmap: normalize emails for Linus Torvalds

peff · gitster · commit 0e230644273b · 2012-12-12T11:09:11.000-08:00
Linus used a lot of different per-machine email addresses in
the early days. This means that "git shortlog -nse" does not
aggregate his counts, and he is listed well below where he
should be (8th instead of 3rd).

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/.mailmap b/.mailmap
@@ -52,6 +52,12 @@ Kent Engstrom <kent@lysator.liu.se>
 Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <lars.doelle@on-line.de>
 Li Hong <leehong@pku.edu.cn>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org>
+Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org.(none)>
 Lukas Sandström <lukass@etek.chalmers.se>
 Marc-André Lureau <marcandre.lureau@gmail.com>
 Mark Rada <marada@uwaterloo.ca>

-Original file line number
+Diff line change
 Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <[email protected]>
 Li Hong <[email protected]>
 +Linus Torvalds <[email protected]> <[email protected]>
 +Linus Torvalds <[email protected]> <[email protected]>
 +Linus Torvalds <[email protected]> <[email protected]>
 +Linus Torvalds <[email protected]> <[email protected]>
 +Linus Torvalds <[email protected]> <[email protected]>
 +Linus Torvalds <[email protected]> <[email protected].(none)>
 Lukas Sandström <[email protected]>
 Marc-André Lureau <[email protected]>
 Mark Rada <[email protected]>