nixos/nixpkgs.git/.gitattributes, branch staging-python Nix Packages collection gitattributes: disable merge=union in all-packages 2018-03-27T16:03:03+00:00 Matthew Justin Bauer mjbauer95@gmail.com 2018-03-27T16:03:03+00:00 bc7df1734f88dfe7e55f56f52d593ff129ec2282 This would lead to some merge issues occasionally. 
This would lead to some merge issues occasionally.
 .gitattributes: merge=union for all-packages.nix 2018-03-22T15:57:38+00:00 Matthew Justin Bauer mjbauer95@gmail.com 2018-03-22T15:57:38+00:00 61381699334cea9a74060b09a2828e05a967fc1e also module-list.nix 
also module-list.nix
 Add .gitattributes file 2018-02-23T22:58:00+00:00 Matthew Bauer mjbauer95@gmail.com 2018-02-23T22:58:00+00:00 af1f5676c9190a9e6f92f0e62b49e515699c9b41 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!