Changes to make things safe for people who have core.autocrlf=true in their git settings, which is basically the default on Windows.
Unfortunately, this requires changes on (virtually) every line of files that use CRLF line terminators, so it' would be best to review this as quickly as possible so that I don't have to fix the merge conflicts too many times.
The git log -p --ignore-cr-at-eol command is useful for verifying that I haven't accidentally changed anything besides CRs at the ends of lines (as would happen if, for example, I had chosen the wrong merge resolution when rebasing these changes on top of any new commits).
(The --ignore-cr-at-eol flag is one of the diff-options, so you can use it with most of git's other diff-generating commands, too.)
alexdima
commented
5 years ago
Changes to make things safe for people who have
core.autocrlf=truein their git settings, which is basically the default on Windows.Unfortunately, this requires changes on (virtually) every line of files that use CRLF line terminators, so it' would be best to review this as quickly as possible so that I don't have to fix the merge conflicts too many times.
The
git log -p --ignore-cr-at-eolcommand is useful for verifying that I haven't accidentally changed anything besides CRs at the ends of lines (as would happen if, for example, I had chosen the wrong merge resolution when rebasing these changes on top of any new commits).(The
--ignore-cr-at-eolflag is one of thediff-options, so you can use it with most of git's other diff-generating commands, too.)