[PATCH 0/2] Update .mailmap for my work address and fix manpage

[PATCH 0/2] Update .mailmap for my work address and fix manpage

[Heiko Stuebner]

From: Heiko Stuebner <heiko.stuebner@vrull.eu>

While updating mailmap for the going-away address, I also found that
on current systems the manpage linked from the header comment changed.

And in fact it looks like the git mailmap feature got its own manpage.


Heiko Stuebner (2):
  mailmap: Update manpage link
  mailmap: add entries for Heiko Stuebner

 .mailmap | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.39.2

[PATCH 1/2] mailmap: Update manpage link

[Heiko Stuebner]

From: Heiko Stuebner <heiko.stuebner@vrull.eu>

On recent systems the git-shortlog manpage only tells people to
    See gitmailmap(5)

So instead of sending people on a scavenger hunt, put that info into the
header directly. Though keep the old reference around for older systems.

Signed-off-by: Heiko Stuebner <heiko.stuebner@vrull.eu>
---
 .mailmap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 4a9d87472ba8..5788fe4371c1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,7 +5,8 @@
 # same person appearing not to be so or badly displayed. Also allows for
 # old email addresses to map to new email addresses.
 #
-# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
+# For format details, see "man gitmailmap" or "MAPPING AUTHORS" in
+# "man git-shortlog" on older systems.
 #
 # Please keep this list dictionary sorted.
 #
-- 
2.39.2

[PATCH 2/2] mailmap: add entries for Heiko Stuebner

[Heiko Stuebner]

From: Heiko Stuebner <heiko.stuebner@vrull.eu>

I am going to lose my vrull.eu address at the end of july, and while adding
it to mailmap I also realised that there are more old addresses from
me dangling, so update .mailmap for all of them.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Heiko Stuebner <heiko.stuebner@vrull.eu>
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index 5788fe4371c1..36a9673d89b6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -178,6 +178,9 @@ Gustavo Padovan <padovan@profusion.mobi>
 Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
 Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
 Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
+Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>
+Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@theobroma-systems.com>
+Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@vrull.eu>
 Henk Vergonet <Henk.Vergonet@gmail.com>
 Henrik Kretzschmar <henne@nachtwindheim.de>
 Henrik Rydberg <rydberg@bitmath.org>
-- 
2.39.2