The `develop` branch was force-pushed resulting in an alternative history

[tnias]

Yesterday the develop branch was force-pushed by @markos from 3a70ed4 to eaa8f91.

This changed all commit ids since the fork(?).
As far as I can tell no code was changed. At least github diff and my local git diff don't show any code changes.

In the last few commits the committer was changed from GitHub <noreply@github.com> to Konstantinos Margaritis <konstantinos@vectorcamp.gr>.

This looks like a rebase accident. I assume only a few commits were meant to be changed.
Could you restore the old history? Or was this intentional?

$ git diff 3a70ed491755c6463380b0f8d780fc586a63519a eaa8f91c955a6d85c6fb720c8c5d2e807db34372
$ echo $?
0
$ git merge-base 3a70ed491755c6463380b0f8d780fc586a63519a eaa8f91c955a6d85c6fb720c8c5d2e807db34372
c00683d73916e39f01b0d418f686c8b5c379159c
$ git show c00683d73916e39f01b0d418f686c8b5c379159c
commit c00683d73916e39f01b0d418f686c8b5c379159c (tag: v5.3.0)
Merge: d79973ef c758cdfb
Author: Hong, Yang A <yang.a.hong@intel.com>
Date:   2020-05-25 14:30:57 +0000

    Merge branch 'github_develop' into github_master

$

I noticed, because github showed it as an event here.

[markos]

No it wasn't an accident, I rewrote history to fix some incorrect mail addresses from markos@users.noreply.github.com to my actual email. No code was changed. This was intentional and only my own email addresses was changed, as I was appearing to be committing as 4-5 separate persons. Unfortunately I know of no other way to fix this other than rewriting history. Sorry about the noise, but it's not an issue and I'm going to close this.

[tnias]

Thanks for the swift reply. :)

I think git's mailmap feature is what you were looking for. https://git-scm.com/docs/gitmailmap

[tnias]

Not sure if I got everything, but this .mailmap could look like this: tnias@290a84d

[markos]

You missed one but you're right, thanks for the tip for .mailmap, I have a couple more addresses to fix so that the Contributors list appears correct. I'll refrain from tampering with the git history in the future. Again sorry for the noise.