通过交互式变基很容易做到这一点:
# Assuming no modified files
git rebase --interactive --rebase-merges $COMMIT_ID_TO_PARENT_OF_THE_PROBLEMATIC_COMMIT
...
# Change "pick" to "edit" in todo-list and exit editor
...
dos2unix your/file/with/wrong/eol.json # or unix2dos if applicable
git add your/file/with/wrong/eol.json
git rebase --continue
如果发生冲突,使用 KDiff3 解决。