Just do fast-forward merges. This means before pushing into the central repo, you rebase your feature branch onto origin/master. Cleaner history and easier to bisect.

However, I prefer non-fast-forward merges for features branches which break in between. Although rebase on origin/master is still good, because you find merge-bugs locally.