[mumblemumble]

I think the more official Git way of doing it would be to collect all the changes in separate commits, and then squash merge them at the end of the code review.