(defun remove-dos-eol () “Do not show ^M in files containing mixed UNIX and DOS line endings.” (interactive) (setq buffer-display-table (make-display-table)) (aset buffer-display-table ?\^M [])) Solution by Johan Bockgård. I found it here.
The regex I use when I want to be precise is “\r\n?|\n”. When I’m not concerned about consistency or empty lines, I use “[\r\n]+”, I imagine it makes my programs somewhere in the order of 0.2% faster.
Run these. It works for me. Customize it with your requirements git config core.autocrlf false git rm –cached -r . git reset –hard
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
This is a classic issue: (picture from Luis Tubes’s blog post) The usual fix is to convert those files yourself, with dos2unix or Swiss File Knife. I have always preferred to keep core.autocrlf to false, which means: git config –global core.autocrlf false
The Replace dialog can handle extended characters like EOL. Just change “Search Mode” to “Extended”, and you can work with EOL (\r\n in Windows or \n in Unix), tabs (\t), etc. You can also use the Find in Files tab of the dialog to do the replace across multiple files.
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.
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
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
For any new document: Settings -> Preferences -> New Document (left pane) -> New Document (right pane) -> Format (Line ending) -> Windows (CR LF) / Unix (LF) / Macintosh (CR) And for an already-open document: Edit -> EOL Conversion