Merged
Conversation
The following is basically the default on Windows: ``` $ git config --global core.autocrlf true ``` In this configuration, git gets *very* confused if there are files with CRLF terminators in the repository, so it's best to avoid having such files. Let's configure Git to avoid adding any more such files.
As hinted at in the end of the preceding commit message, "to avoid adding any more such files", there were already some files with CRLF line terminators in the repository. This commit removes them, thanks to the command: ``` $ git add --renormalize -u ```
Member
|
Thank you! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.)