[PATCH 1/3] add .mailmap for proper git-shortlog output

Antony Pavlov antonynpavlov at gmail.com
Wed Oct 15 05:42:13 PDT 2014


Based on original u-boot commit by Masahiro Yamada:

  commit 8b90a11f7cf1d06812bc9a02e0bae20cfe40a564
  Author: Masahiro Yamada <yamada.m at jp.panasonic.com>
  Date:   Wed Jul 16 17:49:44 2014 +0900

      add .mailmap for proper git-shortlog output

This is the first version of .mailmap created by hand.
Please see "man git-shortlog" for what this commit is trying to do.

Without this file, for example, "git shortlog -n -s" shows as follows:

  (1)  5428  Sascha Hauer
        968  Jean-Christophe PLAGNIOL-VILLARD
  (2)   811  wdenk
  (2)   525  Wolfgang Denk
        348  Juergen Beisert
           ...
  (3)   154  stroese
  (3)   151  Stefan Roese
           ...
  (1)    48  sascha

And then, with this file, it shows as follows:

  (1)  5476  Sascha Hauer
  (2)  1336  Wolfgang Denk
        968  Jean-Christophe PLAGNIOL-VILLARD
        348  Juergen Beisert
        343  Antony Pavlov
  (3)   305  Stefan Roese

Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
Cc: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Sascha Hauer <s.hauer at pengutronix.de>
Cc: Wolfgang Denk <wd at denx.de>
Cc: Stefan Roese <sr at denx.de>
---
 .mailmap | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..8af4375
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,13 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed.
+#
+# This file can be modified by hand or updated by the following command:
+#  scripts/mailmapper > tmp; mv tmp .mailmap
+#
+
+Sascha Hauer <sascha at nomad.localdomain>
+Stefan Roese <stroese>
+Wolfgang Denk <wdenk>
-- 
2.1.1




More information about the barebox mailing list