mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity
323926 commits 262 branches 124 tags 6.9 GiB
Commit graph

3 commits

Author SHA1 Message Date
Matthew Justin Bauer bc7df1734f
gitattributes: disable merge=union in all-packages 
This would lead to some merge issues occasionally.
 2018-03-27 11:03:03 -05:00
Matthew Justin Bauer 6138169933
.gitattributes: merge=union for all-packages.nix 
also module-list.nix
 2018-03-22 10:57:38 -05:00
Matthew Bauer af1f5676c9 Add .gitattributes file 
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!
 2018-02-23 16:58:00 -06:00