Windows command to convert Unix line endings?

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

EOL conversion in notepad ++

That functionality is already built into Notepad++. From the “Edit” menu, select “EOL Conversion” -> “UNIX/OSX Format”. screenshot of the option for even quicker finding (or different language versions) You can also set the default EOL in notepad++ via “Settings” -> “Preferences” -> “New Document/Default Directory” then select “Unix/OSX” under the Format box.

Convert ^M (Windows) line breaks to normal line breaks

Command :%s/<Ctrl-V><Ctrl-M>/\r/g Where <Ctrl-V><Ctrl-M> means type Ctrl+V then Ctrl+M. Explanation :%s substitute, % = all lines <Ctrl-V><Ctrl-M> ^M characters (the Ctrl-V is a Vim way of writing the Ctrl ^ character and Ctrl-M writes the M after the regular expression, resulting to ^M special character) /\r/ with new line (\r) g And do it globally … Read more

Is it possible for git-merge to ignore line-ending differences?

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

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)