Leave the comments in the commit messages and make many small commits! That way they don't change the actual source and they're specific for that version of the code.