Article explaining why .gitattributes is important for configuring a consistent end of file ending in a git repository used by multiple team members on different OSes.
Thanks. I somehow straight-up ignored gitattributes and can’t recall to have seen them in projects. Glad that’s past tense now and I will add presets from your link where appropriate (If I remember it). Never had conflicts with windows users on linux based repos but I suspect thats VSCodes merit in keeping the files as-is.
The two commands in your post are not mentioned in the linked repo-readme but instead in the github docs (see [1]).
I know git reset only from dealing with a detached HEAD. I did not understand the situation as well as the git reset command. Both is explained very good in [2].
So here’s the gist of my research (possibly wrong).
Before you even add the .gitattributes file you should add all unstaged changes, commit & push them. To quickly revert back when things go wrong: zip the whole project.
git rm --cached -r:
Normally git rm would remove a file from the filesystem in addition to the repo but the --cached says to only remove/untrack the file from the repo (what’s inside the .git dir). Recursively removes every file. Cleans the current staging area too. So at this point you’d have to do git add again for every file but you wouldn’t have lost any uncommitted changes in the working dir.
Now for the dangerous part:
git reset --hard
This resets the HEAD to the most recent commit (and cleans the staging-area/index which was already done in the in git rm) and in addition possibly overwrites many unstaged/uncommitted changes with the files contents from the last commit.
So to end this novel. If you havent commited everything before executing the commands your in for a bad time. As far as I see it.
For those who want a ready-made set of
.gitattributefiles you can simply drop on your project, here’s this fancy GitHub link.https://github.com/gitattributes/gitattributes
Once you add a
.gitattributesfile to your project, make sure you push a commit that re-normalizes all relevant files:Thanks. I somehow straight-up ignored gitattributes and can’t recall to have seen them in projects. Glad that’s past tense now and I will add presets from your link where appropriate (If I remember it). Never had conflicts with windows users on linux based repos but I suspect thats VSCodes merit in keeping the files as-is.
The two commands in your post are not mentioned in the linked repo-readme but instead in the github docs (see [1]).
I know
git resetonly from dealing with a detached HEAD. I did not understand the situation as well as thegit resetcommand. Both is explained very good in [2].So here’s the gist of my research (possibly wrong).
Before you even add the .gitattributes file you should add all unstaged changes, commit & push them. To quickly revert back when things go wrong: zip the whole project.
git rm --cached -r: Normallygit rmwould remove a file from the filesystem in addition to the repo but the --cached says to only remove/untrack the file from the repo (what’s inside the .git dir). Recursively removes every file. Cleans the current staging area too. So at this point you’d have to dogit addagain for every file but you wouldn’t have lost any uncommitted changes in the working dir.Now for the dangerous part:
git reset --hardThis resets the HEAD to the most recent commit (and cleans the staging-area/index which was already done in the in git rm) and in addition possibly overwrites many unstaged/uncommitted changes with the files contents from the last commit.So to end this novel. If you havent commited everything before executing the commands your in for a bad time. As far as I see it.
[1].
[2]