I'm a fan of creating two commits in that case: - Refactor to prepare for Feature X - Implement Feature X Note that these can be written in parallel, but jus

I'm a fan of creating two commits in that case: - Refactor to prepare for Feature X - Implement Feature X Note that these can be written in parallel, but just submitted as two separate commits (guess which side of the history editing debate I come down on :) )