chore(identity): .mailmap resolves every past commit to Cato - #180
Merged
Conversation
This repo had no .mailmap, so git log and GitHub showed the raw author of every
commit — and seven variants had accumulated: G, g-but, Mao Nakamoto, three
noreply addresses, a personal gmail, and git's uninitialised default
"Your Name <your.email@example.com>".
A mailmap fixes the displayed author of every existing commit without rewriting
a hash, which is the only proportionate option for history that is already
merged and pushed.
Two kinds of rule are needed. Most variants are matched by commit email alone.
But commits authored as "G" carry the CANONICAL email, so an email-only rule
cannot reach them — mailmap matches on the commit's email, and theirs is
already the target. Those need a name+email rule on both sides.
Verified rather than assumed, over the last 400 commits:
before: G, g-but, Mao Nakamoto, Your Name, Devin AI, dependabot
after: 288 Cato · 108 Devin AI · 4 dependabot
Devin AI and dependabot are genuinely different authors and are left alone.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01G2LBioUzJP4oBL9LeH9qAe
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This repo had no
.mailmap, sogit logand GitHub showed the raw author of every commit — and seven variants had accumulated:G,g-but,Mao Nakamoto, three noreply addresses, a personal gmail, and git's uninitialised defaultYour Name <your.email@example.com>.A mailmap fixes the displayed author of every existing commit without rewriting a hash — the only proportionate option for history already merged and pushed.
Two kinds of rule, and the difference matters
Most variants match by commit email alone. But commits authored as
Gcarry the canonical email, so an email-only rule cannot reach them — mailmap matches on the commit's email, and theirs is already the target. Those need aname <email>rule on both sides.Verified, not assumed
git log --use-mailmap --format='%aN'over the last 400 commits. Devin AI and dependabot are genuinely different authors and are correctly left alone.Companion PRs: vitareba#93, fleetcrown, evig.
orangecat's mailmap was already correct.🤖 Generated with Claude Code