The "cleaner" commit history should be a separate layer and the actual commit history should never be altered.