Exactly! Just separate the commits which fix formatting from the ones that change code.