summaryrefslogtreecommitdiffstats
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* bpo-31358: Pull zlib out of the repository (GH-3375)Zachary Ware2017-09-071-3/+0
| | | Also enable building externals by default on Windows, use PCbuild\build.bat's -E option to disable it.
* bpo-27425: Be more explicit in .gitattributes (GH-840)Zachary Ware2017-06-101-6/+39
| | | Updates checked-in line endings on several files.
* remove merge=union attribute for Misc/NEWS (GH-460)INADA Naoki2017-03-041-2/+0
| | | | | | Github doesn't support it (ref. isaacs/github#487). So it can't ease conflict on Github. Additionally, it can make trouble when cherry-pick. (ref. GH-212)
* mark various test data binary (#233)Benjamin Peterson2017-02-231-0/+9
|
* .gitattribute -> .gitattributes (GH-213)INADA Naoki2017-02-211-0/+1