GIT: normalize eol#30
Open
LegalizeAdulthood wants to merge 2 commits intoopen-simh:masterfrom
Open
Conversation
Author
|
Given that this change is likely to cause conflicts in other PRs, it should probably be applied after other PRs are merged. |
- Visual Studio project/solution files are always CRLF - all others are auto
LegalizeAdulthood
force-pushed
the
legalize-normalize-eol
branch
from
324838a to
ad5d8dc
Compare
Author
|
I updated the commit messages to follow the preferred format |
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
1 participant
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.
The files in the repository had a mixture of line endings -- some were LF, some were CR LF.
This PR adds a
.gitattributesthat specifies that Visual Studio project and solution files are explicitly CR LF and the remainder aretext=auto.The EOL for files in the repository are normalized to LF line endings.
When you check out the repository on unix, you get text files with LF line endings.
When you check out the repository on Windows, you get text files with CR LF line endings.
git marshals back and forth when you push/pull from the repository on either platform.