I'm feeling slow here today but I'm attempting to merge some code from a third party developer who is NOT using git. He is manually sending me files from his windows machine in India where he has edited them with dreamweaver (currently he has the line ending type set to "CR"). When I get the files, on my MacOSX machine, they have windows line endings (^M in vim) so I strip them with this perl command
perl -pe 's/\r\n|\n|\r/\n/g' orders.dev.php > orders.php which strips the windows line endings and works great in the file editors I have. The problem is when I try to add that file to git the entire file shows as changed. If the line termination was windows that would make sense to me but I'm stripping that. After doing some googling I found this github post https://help.github.com/articles/dealing-with-line-endings which looks like I can use git to force a specific line ending or in Mac's case tell it to use whatever the file has none of which seemed to make any difference for me. Bottom line I can't figure out how to show the changes the actual developer made. It always shows the entire file changed. What am I missing?
P.S. Извините за длину, но требуемый, чтобы показать я только бросаю вопрос там. Я изучил его. Просто по некоторым причинам должны все же наткнуться на то, что я пропускаю (другой тогда вторая чашка кофе).