.gitattributes

   1 # To enable automatic merging of ChangeLog files, use the following command:
   2 # git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
   3 ChangeLog* merge=changelog
   4
   5 # To enable smart diffing of ObjC[++] files, run the following commands:
   6 # git config diff.objcpp.xfuncname "^[-+@a-zA-Z_].*$"
   7 # git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"
   8 *.m diff=objc
   9 *.mm diff=objcpp
  10 mac/*.h diff=objcppheader
  11 */mac/*.h diff=objcppheader
  12 */*/mac/*.h diff=objcppheader
  13 objc/*.h diff=objcppheader
  14 */objc/*.h diff=objcppheader
  15 */*/objc/*.h diff=objcppheader
  16
  17 # To enable smart diffing of *.strings files, run the following command:
  18 # git config diff.localizablestrings.textconv "iconv -f utf-16 -t utf-8"
  19 *.strings diff=localizablestrings
  20
  21 *.vcproj eol=crlf
  22 *.vsprops eol=crlf
  23 *.sln eol=crlf
  24
  25 # For best performance, place rules for deep paths in the parent directory.
  26 # For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,
  27 # place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes
  28
  29 # Exclude these git specific files from archives created via git-archive.
  30 .gitignore      export-ignore
  31 .gitattributes  export-ignore