Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .gitattributes file #35427

Merged
merged 1 commit into from Mar 22, 2018
Merged

Conversation

matthewbauer
Copy link
Member

This adds the .gitattributes file to the tree. I’ve added two
attributes: linguist-generated, and linguist-documentation.

GitHub’s Linguist will follow this when calculating our language stats
as well as in other cases like commit diffs.

Any additional attributes or other generated files are welcome to be added!

This adds the .gitattributes file to the tree. I’ve added two
attributes: linguist-generated, and linguist-documentation.

GitHub’s Linguist will follow this when calculating our language stats
as well as in other cases like commit diffs.

Any additional attributes or other generated files are welcome to be added!
@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

Do they also support something in .github instead?
To not clutter the top level directory too much.

@matthewbauer
Copy link
Member Author

Do they also support something in .github instead?

I don't think so. ".gitattributes" is a Git file like gitignore so maybe there is a trick to hide it?

@matthewbauer
Copy link
Member Author

Another attribute Git supports is "merge". We may want to set "merge=union" for pkgs/top-level/all-packages.nix to make merge conflict handling a little smarter when there are two versions of the file.

@Mic92
Copy link
Member

Mic92 commented Mar 22, 2018

nixos/modules/module-list.nix is a good candidate for merge=union.

@matthewbauer matthewbauer deleted the gitattributes branch February 22, 2019 04:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants