Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Normalize line endings #2978
This partially addresses Issue #2955. I added a .gitattributes file which tells git to automatically recognize text files and normalize the line endings. It also ensures that .pde files and .java files are always treated as text. All of the previously un-normalized files are now normalized. You may be able to merge these file without all of the explicit changes by using the merge.renormalize option. I am not entirely certain on that though and how it works.
These should both use Windows line-endings (they were incorrectly converted to native text in the PR)
And per the description here is there not a way to do this that doesn't make the commit history look like you've rewritten the file?
I have updated the .gitattributes file so that
always use windows line endings on checkout.
I created a new branch and followed the steps in the previously linked article but it produced the same results of modifying the 30ish files with un-normalized line endings. According to this guide which I followed originally and this post which references the github instructions, the goal is to force git to recognize all of the line-changes immediately so they show up in the "right" commit instead of appearing later as different contributors merge their changes.
I tested cloning the textAuto branch on my linux system and now the only two files that have windows line endings are