Dealing with line endings



https://help.github.com/articles/dealing-with-line-endings/

Pushing Changes to the Upstream (Git Push)Using Perforce Integration
Handling LF and CRLF Line Endings
On this page:
• Basics
• Enabling smart handling of LF and CRLF line separators
• Handling the problems with line separators during commit
Basics
Quite often people working in a team and using the same repository or upstream prefer different operating systems. This may result in problems with line endings, becauseUnix,Linux, and OS X use LF and Windows uses CRLF to denote the end of a line. PhpStorm shows the discrepancies in line endings in theDifference Viewer Dialog, so you can fix them manually.
To have Git solve such problems automatically, you need to set the core.autocrlf attribute to true on Windows and to input on Linux and OS X. For more details on the meaning of the core.autocrlf attribute, see the article Mind the End of Your Line orDealing with Line Endings. You can change the configuration manually by running git config --global core.autocrlf true on Windows or git config --global core.autocrlf input on Linux and OS X