OpenOffice did what looks a bit like a "squash merge" way back in the day. It's a nightmare to work out where things got changed. I don't recommend it.

I quite agree. Fix your commit history via an interactive rebase before you push. Learn to love fixup.