[JelteF]

I learned about the --first-parent flag of git blame recently. It allows git blame to work well in repos that use merge commits.

[3np]

There is also -r, which leaves merge commits and lets you move them around.