Q: What is `.mailmap` and when would you use it?
mailmap is a file that maps different author names and emails to a canonical identity. It fixes inconsistencies in git log, git shortlog, and git blame without rewriting history.
Want to master this scenario in a live sandbox? KodeKloud's Advanced Git Workflows, Rebase & Interactive Diagnostics covers this exact problem with hands-on terminal drills.
🛠️ Production Runbook & Step-by-Step Resolution
Direct Answer: "During a major release branch cut, we encountered this exact scenario and used Git internals to recover cleanly. The interviewer is testing: Awareness of author normalization in Git history.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third."
Initial Diagnostics & Root Cause Analysis
.mailmap is a file that maps different author names and emails to a canonical identity. It fixes inconsistencies in git log, git shortlog, and git blame without rewriting history.
- Open-source projects where contributors use different emails (work vs personal).
- Post-acquisition consolidation (merging email domains).
- Correcting typos in historical author names.
Remediation & Permanent Safeguards
The problem: over time, the same person commits with different identities: The solution — .mailmap in the repo root: Format: Canonical Name After adding this file, git shortlog -sne and git log --format='%aN' consolidate all entries under the canonical identity. git blame also uses it. Use cases: The .mailmap file should be committed to the repo. It doesn't change any commit objects — it's a display-time mapping only.
Alice Smith <alice@company.com>
Alice <alice@personal.com>
A. Smith <asmith@oldcompany.com>
git shortlog -snefor accurate contribution statistics.
- Open-source projects where contributors use different emails (work vs personal).
- Post-acquisition consolidation (merging email domains).
- Correcting typos in historical author names.
Senior hiring managers and bar raisers evaluate how you prioritize during outages. Avoid these common anti-patterns:
-
Running raw git push --force rather than git push --force-with-lease on shared team feature branches when configuring mailmap
git push --forceunconditionally overwrites remote commits made by teammates, whereas--force-with-leaseaborts if the remote ref was updated. - Resolving complex merge conflicts with blind checkout overwrite strategies without running unit tests when configuring mailmap Unilateral conflict resolution frequently clobbers complementary logic introduced in parallel feature branches, creating regression bugs.
-
Discarding corrupted working directories prematurely instead of recovering lost state using git reflog when configuring mailmap
git reflogtracks every HEAD movement, allowing instant recovery of discarded commits, botched rebases, or deleted local branches. - Disabling branch protection rules and mandatory PR approval reviews on shared release branches when configuring mailmap Without branch protection, developers can bypass CI validation gates and push untested code directly to production branches.