Comment by dilap

I will never understand why people hate merge commits. It's an accurate history of what happened, and can be useful in tracking down bugs.