summary refs log tree commit diff
path: root/.gitattributes
Commit message (Collapse)AuthorAge
* gitattributes: disable merge=union in all-packagesMatthew Justin Bauer2018-03-27
| | | This would lead to some merge issues occasionally.
* .gitattributes: merge=union for all-packages.nixMatthew Justin Bauer2018-03-22
| | | also module-list.nix
* Add .gitattributes fileMatthew Bauer2018-02-23
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!