I'd create an initial separate commit with only style changes and then have my new or changed code follow the code standard. The code converges very fast if everyone does that.
Caveat: Try to time it carefully if the code is being actively developed, to reduce risk of merge conflicts and annoyances to the rest of the team. It just leads to a lot of "stop doing that!" and further resistance to that kind of refactoring.