I didn't used to believe in rewriting git history, but it seems git blame requires a clean history to work well, and git blame can be very handy on occasion.

Given the presence of merge modes in this branch, rewriting the branch could be tricky.  The easiest thing might be to add one more commit, reverting the formatting changes.  Then we use `git merge --squash` for the actual merge into integration/master.  This will lead to a single commit in master.