Force --no-ff merges in git. That's pretty much what you want.