@b0rk I use --no-merges to cut down some of the noise but it's not an ideal situation.

I tend to rely on git blame a lot within IntelliJ to grok changes to individual files.