summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap4
-rw-r--r--debian/changelog1
2 files changed, 5 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..d8f16ff2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Joey Hess <joey>
+Joey Hess <joeyh>
+Valéry Perrin <vperrin-guest>
+Valéry Perrin <valery.perrin.debian@free.fr>
diff --git a/debian/changelog b/debian/changelog
index 31a384a1..719e459f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debhelper (9.20160814+unreleased) UNRELEASED; urgency=medium
* Use uppercase "Debian" in package description when the project is
meant. Fixes lintian warning capitalization-error-in-description.
* Apply "wrap-and-sort -a"
+ * Add a .mailmap file for making "git shortlog" work properly.
-- Niels Thykier <niels@thykier.net> Sun, 14 Aug 2016 09:30:15 +0000