summaryrefslogtreecommitdiff
path: root/.gitattributes (follow)
Commit message (Expand)AuthorAgeFilesLines
* gitattributes: disable merge=union in all-packages•••This would lead to some merge issues occasionally.Matthew Justin Bauer2018-03-271-1/+1
* .gitattributes: merge=union for all-packages.nix•••also module-list.nixMatthew Justin Bauer2018-03-221-0/+3
* 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! Matthew Bauer2018-02-231-0/+13