New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .mailmap file to fix git shortlog #412

Merged
merged 1 commit into from Jan 20, 2017

Conversation

Projects
None yet
2 participants
@ravage84
Member

ravage84 commented Nov 24, 2016

When executing git shortlog -sne it show, for example:

655	Manuel Pichler <mapi@manuel-pichler.de>
195	Manuel Pichler <github@manuel-pichler.de>

With this file, it becomes:

850	Manuel Pichler <mapi@manuel-pichler.de>

https://git-scm.com/docs/git-shortlog#_mapping_authors
https://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/
https://shane.io/2011/10/07/git-shortlog-and-mailmap.html

@ravage84 ravage84 added this to the 2.5.1 milestone Nov 24, 2016

@manuelpichler manuelpichler merged commit 20bad69 into master Jan 20, 2017

4 checks passed

continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@manuelpichler manuelpichler deleted the mailmap branch Jan 20, 2017

@ravage84 ravage84 modified the milestones: 2.5.1, 2.6.0 Jan 30, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment