97eee80f27
Merge commits aren't going to be merged upstream for these break all sorts of git tools including log -p, blame, bisect, etc (or make their use less convenient).