summaryrefslogtreecommitdiffstats
path: root/.gitattributes
AgeCommit message (Collapse)Author
2018-03-27gitattributes: disable merge=union in all-packagesMatthew Justin Bauer
This would lead to some merge issues occasionally.
2018-03-22.gitattributes: merge=union for all-packages.nixMatthew Justin Bauer
also module-list.nix
2018-02-23Add .gitattributes fileMatthew Bauer
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!