Add .mailmap with affiliations

velox/docs/.mailmap

@@ -0,0 +1,55 @@
+Amit Dutta <Meta> <[email protected]>
+Andrii Rosa <Meta> <[email protected]>
+Andrii Rosa <Meta> <[email protected]>
+Ankita Victor <Microsoft> <[email protected]>
+Athmaja N <IBM> <[email protected]>
+Bikramjeet Vig <Meta> <[email protected]>
+Daniel Hunte <Meta> <[email protected]>
+Daniel Jonathan Hunte <Meta> <[email protected]>
+Deepak Majeti <IBM> <[email protected]>
+Deepashree Gandhi <IBM> <[email protected]>
+Huameng (Michael) Jiang <Meta> <[email protected]>
+Jacob Khaliqi <IBM> <[email protected]>
+Jacob Wujciak-Jens <Voltron Data> <[email protected]>
+Jia Ke <Intel> <[email protected]>
+Jialiang Tan <Meta> <[email protected]>
+Jialiang Tan <Meta> <[email protected]>
+Jimmy Lu <Meta> <[email protected]>
+Kevin Wilfong <Meta> <[email protected]>
+Kevin Wilfong <Meta> <[email protected]>
+Krishna Pai <Meta> <[email protected]>
+Kunal Kataria <Meta> <[email protected]>
+Masha Basmanova <Meta> <[email protected]>
+Masha Basmanova <Meta> <[email protected]>
+Orri Erling <Meta> <[email protected]>
+PHILO-HE <Intel> <[email protected]>
+Pedro Eugenio Rocha Pedreira <Meta> <[email protected]>
+Pedro Pedreira <Meta> <[email protected]>
+Pranjal Shankhdhar <Meta> <[email protected]>
+Pramod Satya <IBM> <[email protected]>
+Pramod Satya <IBM> <[email protected]>
+Pratik Joseph Dabre <IBM> <[email protected]>
+Reetika Agrawal <IBM> <[email protected]>
+Sandino Flores <Intel> <[email protected]>
+Wei He <Meta> <[email protected]>
+Yoav Helfman <Meta> <[email protected]>
+Zac Wen <Meta> <[email protected]>
+Zhenyuan Zhao <Meta> <[email protected]>
+Aditi Pandit <IBM> <[email protected]>
+chenweiguo.vc <ByteDance> <[email protected]>
+Deepthy Davis <IBM> <[email protected]>
+duanmeng <Tencent> <[email protected]>
+joey.ljy <Alibaba> <[email protected]>
+liangyongyuan <Xiaomi> <[email protected]>
+lingbin <Alibaba> <[email protected]>
+lingbin <Alibaba> <[email protected]>
+Rui Mo <Intel> <[email protected]>
+Soumya Duriseti <IBM> <[email protected]>
+wjameswu <Tencent> <[email protected]>
+wypb <Tencent> <[email protected]>
+wypb <Tencent> <[email protected]>
+xiaoxmeng <Meta> <[email protected]>
+Yan Ma <Intel> <[email protected]>
+yangshijie.2024 <ByteDance> <[email protected]>
+yanngyoung <Tencent> <[email protected]>
+Zhen Li <Microsoft> <[email protected]>

velox/docs/README.md

@@ -51,11 +51,19 @@ The goal of the monthly update is for Velox users to understand the latest
 improvements and changes to Velox.
 This report is generated manually with the help of the following commands and template.
 
-Command to get the list of contributors and their contribution count in a specific month.
+Contributor affiliations are stored in `velox/docs/.mailmap`. This is used
+to improve the contributor stats accuracy as contributor email addresses
+aren't always consistent. New contributors must add to this file.
+To get the list of contributors in a specific month say June-2024, from the Velox root directory
+execute the following commands:
 ```
-git shortlog -sen --since='June 1 2024' --until='June 30 2024'
+cp velox/docs/.mailmap .
+git shortlog -se --since='June 1 2024' --until='June 30 2024'
+rm .mailmap
 ```
-Command to get the list of contributions in a specific month.
+
+To get the list of contributions in a specific month, from the Velox root directory
+execute the following command:
 ```
 git log --since='June 1 2024' --until='June 30 2024' --pretty=format:"%h%x09%an%x09%ad%x09%s"
 ```

velox/docs/monthly-updates/june-2024.rst

@@ -87,61 +87,54 @@ Credits
 =======
 ::
 
-    56  Masha Basmanova <[email protected]>
-    20  Kevin Wilfong <[email protected]>
-    17  Jimmy Lu <[email protected]>
-    16  xiaoxmeng <[email protected]>
-    13  Deepak Majeti <[email protected]>
-     9  Pedro Eugenio Rocha Pedreira <[email protected]>
-    11  Zac Wen <[email protected]>
-     8  Bikramjeet Vig <[email protected]>
-     7  Ke <[email protected]>
-     7  Wei He <[email protected]>
-     6  Jialiang Tan <[email protected]>
-     6  wypb <[email protected]>
-     5  Jacob Wujciak-Jens <[email protected]>
-     5  PHILO-HE <[email protected]>
-     5  zhli1142015 <[email protected]>
-     4  Kevin Wilfong <[email protected]>
-     4  Orri Erling <[email protected]>
-     4  duanmeng <[email protected]>
-     4  yanngyoung <[email protected]>
-     3  Jia Ke <[email protected]>
-     3  Krishna Pai <[email protected]>
-     3  Pramod <[email protected]>
-     3  Sandino Flores <[email protected]>
-     3  lingbin <[email protected]>
-     3  mwish <[email protected]>
-     2  Andrii Rosa <[email protected]>
-     2  Christian Zentgraf <[email protected]>
-     2  rui-mo <[email protected]>
-     2  wypb <[email protected]>
-     1  Amit Dutta <[email protected]>
-     1  Andrii Rosa <[email protected]>
-     1  Ankita Victor <[email protected]>
-     1  Athmaja N <[email protected]>
-     1  Daniel Hunte <[email protected]>
-     1  Daniel Jonathan Hunte <[email protected]>
-     1  Deepashree Gandhi <[email protected]>
-     1  Huameng (Michael) Jiang <[email protected]>
-     1  Jacob Khaliqi <[email protected]>
-     1  Jialiang Tan <[email protected]>
-     1  Kunal Kataria <[email protected]>
-     1  NEUpanning <[email protected]>
-     1  Pranjal Shankhdhar <[email protected]>
-     1  Pratik Joseph Dabre <[email protected]>
-     1  Reetika Agrawal <[email protected]>
-     1  Yoav Helfman <[email protected]>
-     1  Zhenyuan Zhao <[email protected]>
-     1  aditi-pandit <[email protected]>
-     1  chenweiguo.vc <[email protected]>
-     1  deepthydavis <[email protected]>
-     1  gaoyangxiaozhu <[email protected]>
-     1  joey.ljy <[email protected]>
-     1  liangyongyuan <[email protected]>
-     1  lingbin <[email protected]>
-     1  rexan <[email protected]>
-     1  soumyaduriseti <[email protected]>
-     1  wjameswu <[email protected]>
-     1  yan ma <[email protected]>
-     1  yangshijie.2024 <[email protected]>
+     1	Aditi Pandit <IBM>
+     1	Amit Dutta <Meta>
+     3	Andrii Rosa <Meta>
+     1	Ankita Victor <Microsoft>
+     1	Athmaja N <IBM>
+     8	Bikramjeet Vig <Meta>
+     2	Christian Zentgraf <[email protected]>
+     2	Daniel Jonathan Hunte <Meta>
+    13	Deepak Majeti <IBM>
+     1	Deepashree Gandhi <IBM>
+     1	Deepthy Davis <IBM>
+     1	Huameng (Michael) Jiang <Meta>
+     1	Jacob Khaliqi <IBM>
+     5	Jacob Wujciak-Jens <Voltron Data>
+     3	Jia Ke <Intel>
+     7	Jialiang Tan <Meta>
+    17	Jimmy Lu <Meta>
+     7	Ke <[email protected]>
+    24	Kevin Wilfong <Meta>
+     3	Krishna Pai <Meta>
+     1	Kunal Kataria <Meta>
+    55	Masha Basmanova <Meta>
+     1	NEUpanning <[email protected]>
+     4	Orri Erling <Meta>
+     5	PHILO-HE <Intel>
+     8	Pedro Pedreira <Meta>
+     3	Pramod Satya <IBM>
+     1	Pranjal Shankhdhar <Meta>
+     1	Pratik Joseph Dabre <IBM>
+     1	Reetika Agrawal <IBM>
+     2	Rui Mo <Intel>
+     3	Sandino Flores <Intel>
+     1	Soumya Duriseti <IBM>
+     7	Wei He <Meta>
+     1	Yan Ma <Intel>
+     1	Yoav Helfman <Meta>
+    11	Zac Wen <Meta>
+     5	Zhen Li <Microsoft>
+     1	Zhenyuan Zhao <Meta>
+     1	chenweiguo.vc <ByteDance>
+     4	duanmeng <Tencent>
+     1	gaoyangxiaozhu <[email protected]>
+     1	joey.ljy <Alibaba>
+     1	liangyongyuan <Xiaomi>
+     4	lingbin <Alibaba>
+     3	mwish <[email protected]>
+     1	rexan <[email protected]>
+     9	wypb <Tencent>
+    16	xiaoxmeng <Meta>
+     1	yangshijie.2024 <ByteDance>
+     4	yanngyoung <Tencent>