Question: Line endings messed up in Git - how to track changes from another branch after a huge line ending fix?