This is a state-of-the-union answer as of Windows PowerShell v5.1 / PowerShell Core v6.2.0: Andrew Savinykh’s ill-fated answer, despite being the accepted one, is, as of this writing, fundamentally flawed (I do hope it gets fixed – there’s enough information in the comments – and in the edit history – to do so). Ansgar Wiecher’s … Read more
This can actually be done very easily using the more command which is included in Windows NT and later. To convert input_filename which contains UNIX EOL (End Of Line) \n to output_filename which contains Windows EOL \r\n, just do this: TYPE input_filename | MORE /P > output_filename The more command has additional formatting options that … Read more
Update 2013: More recent git versions authorize using merge with strategy recursive and strategy option (-X): from “Git Merge and Fixing Mixed Spaces and Tabs with two Branches“: git merge -s recursive -Xignore-space-at-eol But using “-Xignore-space-change” is also a possibility Fab-V mentions below: git merge master -s recursive -X renormalize jakub.g also comments that the … Read more
Without a bit of information about what files are in your repository (pure source code, images, executables, …), it’s a bit hard to answer the question 🙂 Beside this, I’ll consider that you’re willing to default to LF as line endings in your working directory because you’re willing to make sure that text files have … Read more
Almost four years after asking this question, I have finally found an answer that completely satisfies me! See the details in github:help‘s guide to Dealing with line endings. Git allows you to set the line ending properties for a repo directly using the text attribute in the .gitattributes file. This file is committed into the … Read more
Yes, PHP_EOL is ostensibly used to find the newline character in a cross-platform-compatible way, so it handles DOS/Unix issues. Note that PHP_EOL represents the endline character for the current system. For instance, it will not find a Windows endline when executed on a unix-like system.
Java 7 now has a System.lineSeparator() method.