Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Pearce2014-11-30 18:34:36 +0000
committerMatthias Sohn2015-01-02 21:48:53 +0000
commit6224d24e000a7bcaf680b2e5d6955fd8fd2ac46d (patch)
tree27b3601225d23c0794049ff580bffeb69889b9e5
parent8f85ec7af6c3568d1ede40a7e99fb5fa8614d7d3 (diff)
downloadjgit-6224d24e000a7bcaf680b2e5d6955fd8fd2ac46d.tar.gz
jgit-6224d24e000a7bcaf680b2e5d6955fd8fd2ac46d.tar.xz
jgit-6224d24e000a7bcaf680b2e5d6955fd8fd2ac46d.zip
Add .mailmap to correct Shawn and Saša's log entries
Both myself and Saša Živkov have been using different names and email addresses in the JGit history. Configure .mailmap to map to consistent entries for us. Saša Živkov's entries were taken from the Gerrit Code Review .mailmap file. Change-Id: I3fad123c453c3a1e2972ae0616757fd34b003165
-rw-r--r--.mailmap5
1 files changed, 5 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..8701b19192
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <sop@google.com>
+Shawn Pearce <spearce@spearce.org> Shawn Pearce <sop@google.com>
+Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <spearce@spearce.org>
+Saša Živkov <sasa.zivkov@sap.com> Sasa Zivkov <sasa.zivkov@sap.com>
+Saša Živkov <sasa.zivkov@sap.com> Saša Živkov <zivkov@gmail.com>

Back to the top