Commit late, commit once. Pretty sure that's how it goes.