Preserving commit history