If you don't mind I'd try to be consistent within one commit:file and eventually strip them all in one go.