From aa1fc30b898a928ddafbfd0fddc47547c04f96e5 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 11 Aug 2016 16:57:48 -0700
Subject: [PATCH] Add .mailmap

---
 .codebeatignore | 3 ++-
 .mailmap        | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .mailmap

diff --git a/.codebeatignore b/.codebeatignore
index d2a8660ccf67..bfb9b911bea4 100644
--- a/.codebeatignore
+++ b/.codebeatignore
@@ -1,6 +1,7 @@
 conf/**
 docker/**
-public/**
+modules/bindata/**
 packager/**
+public/**
 scripts/**
 templates/**
\ No newline at end of file
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..88ff1591a4a8
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Unknwon <u@gogs.io> <joe2010xtmf@163.com>
+Unknwon <u@gogs.io> 无闻 <u@gogs.io>