ref: 14ea8848fbcd8727085d648bc2c192c173eaac8a
parent: 9d85ce8e0cc588629650690a5fa0ed559ed77d30
parent: 9fde1f2ee3cc149ec45a01942f9898f5f80648e8
author: Johann Koenig <[email protected]>
date: Mon Dec 7 13:14:05 EST 2015
Merge "Strip redundant entries from .mailmap"
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,4 @@
Adrian Grange <[email protected]>
-Adrian Grange <[email protected]> <[email protected]>
Aℓex Converse <[email protected]>
Aℓex Converse <[email protected]> <[email protected]>
Alexis Ballier <[email protected]> <[email protected]>
@@ -8,13 +7,11 @@
Erik Niemeyer <[email protected]> <[email protected]>
Guillaume Martres <[email protected]> <[email protected]>
Hangyu Kuang <[email protected]>
-Hangyu Kuang <[email protected]> <[email protected]>
Hui Su <[email protected]>
Jacky Chen <[email protected]>
Jim Bankoski <[email protected]>
Johann Koenig <[email protected]>
Johann Koenig <[email protected]> <[email protected]>
-Johann Koenig <[email protected]> <[email protected]>
Johann Koenig <[email protected]> <[email protected]>
John Koleszar <[email protected]>
Joshua Litt <[email protected]> <[email protected]>
@@ -33,4 +30,3 @@
Tom Finegan <[email protected]>
Tom Finegan <[email protected]> <[email protected]>
Yaowu Xu <[email protected]> <[email protected]>
-Yaowu Xu <[email protected]> <[email protected]>
--- a/tools/gen_authors.sh
+++ b/tools/gen_authors.sh
@@ -6,7 +6,7 @@
# This file is automatically generated from the git commit history
# by tools/gen_authors.sh.
-$(git log --pretty=format:"%aN <%aE>" | sort | uniq)
+$(git log --pretty=format:"%aN <%aE>" | sort | uniq | grep -v corp.google)
Google Inc.
The Mozilla Foundation
The Xiph.Org Foundation