summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2016-08-07 10:01:34 +0300
committerInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2016-08-08 21:24:49 +0000
commit6ff2011b96d684b653b0fe91a84348f96d2771ec (patch)
tree80709a6f4903e654fe4fc26913201731ba82a8fd /.mailmap
parent5bf86797197217354ae159be056913819d38688e (diff)
mailmap: Fix broken author information for Evan Couzens
Once again, broken commits have been merged with incorrect author information. Fix this in .mailmap. Before this patch (git shortlog): viggo.jf.intel.com (2): doc: Move code contribution info to wiki. doc: Move code conventions to Zephyr wiki. After the patch: Evan Couzens (2): doc: Move code contribution info to wiki. doc: Move code conventions to Zephyr wiki. Change-Id: I382c06b49fdc5f6c81bc9ec952c5958b4e1ca144 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 0ca0cc14a..ce686a916 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,3 +11,4 @@ Bit Pathe <bitpathe@gmail.com> <bitpathe@gmail.com>
Carles Cufi <carles.cufi@nordicsemi.no> <carles.cufi@nordicsemi.no>
Kuo-Lang Tseng <kuo-lang.tseng@intel.com> <kuo-lang.tseng@intel.com>
Gerardo Aceves <gerardo.aceves@intel.com> <gerardo.aceves@intel.com>
+Evan Couzens <evanx.couzens@intel.com> <evanx.couzens@intel.com>