Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Should the .gitattributes file be in the commit?

Tags:

git

merge

We're working on a project with a few people having a Mac, and I am running on Windows. We get some problems with the linebreaks.

I read on GitHub that I could add this:

# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary

Into .gitattributes

But should I commit that file to GitHub so the other people with Macs get the same settings?

If it matters, we're coding websites. (PHP, JavaScript files, and stuff).

For the record, I'm the only one with Windows... So yeah, what can I do?

like image 508
Muqito Avatar asked Feb 26 '13 13:02

Muqito


2 Answers

I added this:

# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary

and committed it to the GitHub server. So everyone who had this fixed the problems.

like image 178
Muqito Avatar answered Nov 11 '22 22:11

Muqito


First of all, I recommend reading the documentation first.

It suggests either checking in the .gitattributes file at the root of your repository or inside your local .git folder here: .git/info/attributes.

The latter option will probably have the least impact (if you are the only Windows user).

With this kind of thing I tend to put the onus on whoever 'likes to be different' in the team - e.g. if all but one of the devs are using Mac's and the other is using Windows for example, it should really be up to the guy who is going against the grain to sort out. It's nothing malicious, just fair :-)

like image 34
ben.snape Avatar answered Nov 11 '22 21:11

ben.snape