Merge branch 'rs/help-c-source-with-gitattributes' into maint
commite223c2c77f7e578e085c80c59440475cff056dc0
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:19 +0000 (10 11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:20 +0000 (10 11:55 -0700)
tree6354c73dcef56950c400c8e2c502c02c81e2006d
parent61efc5c2d81cbd8c9a5d145e1aab2f744772c856
parente82675a040d559c56be54255901138a979eeec21
Merge branch 'rs/help-c-source-with-gitattributes' into maint

The .c/.h sources are marked as such in our .gitattributes file so
that "git diff -W" and friends would work better.

* rs/help-c-source-with-gitattributes:
  .gitattributes: set file type for C files