X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=.gitattributes;h=06b03f952c8d3ed1d4a28604f13b7c63ab35d0ce;hp=80386aeb3e2cb0b6b0df2f44f5fba48191559dbd;hb=4cd7e661391917666829c88456ffe1fb24ab6477;hpb=4d3e59ba122d4fd35ff2d737bface129ec42e1f6;ds=sidebyside

diff --git a/.gitattributes b/.gitattributes
index 80386ae..06b03f9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,19 @@
 # git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
 ChangeLog* merge=changelog
 
+# To enable smart diffing of ObjC[++] files, run the following commands:
+# git config diff.objcpp.xfuncname "^[-+@a-zA-Z_].*$"
+# git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"
+*.m diff=objc
+*.mm diff=objcpp
+mac/*.h diff=objcppheader
+*/mac/*.h diff=objcppheader
+*/*/mac/*.h diff=objcppheader
+objc/*.h diff=objcppheader
+*/objc/*.h diff=objcppheader
+*/*/objc/*.h diff=objcppheader
+WebKitTools/WebKitLauncher/*.h diff=objcppheader
+
 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln -crlf
 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj -crlf
 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops -crlf
@@ -239,6 +252,15 @@ WebKit/win/WebKit.vcproj/WebKit.sln -crlf
 WebKit/win/WebKit.vcproj/WebKit.submit.sln -crlf
 WebKit/win/WebKit.vcproj/WebKit.vcproj -crlf
 WebKit/win/WebKit.vcproj/WebKitGUID.vcproj -crlf
+WebKit2/win/WebKit2.vcproj -crlf
+WebKit2/win/WebKit2Apple.vsprops -crlf
+WebKit2/win/WebKit2CFLite.vsprops -crlf
+WebKit2/win/WebKit2Common.vsprops -crlf
+WebKit2/win/WebKit2DirectX.vsprops -crlf
+WebKit2/win/WebKit2Generated.vcproj -crlf
+WebKit2/win/WebKit2GeneratedCommon.vsprops -crlf
+WebKit2/win/WebKit2WebProcess.vcproj -crlf
+WebKit2/win/WebKit2WebProcessCommon.vsprops -crlf
 WebKitLibraries/win/tools/vsprops/WinCairo.vsprops -crlf
 WebKitLibraries/win/tools/vsprops/cURL.vsprops -crlf
 WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops -crlf
@@ -271,3 +293,8 @@ WebKitTools/WinLauncher/WinLauncher.h -crlf
 WebKitTools/WinLauncher/WinLauncher.vcproj -crlf
 WebKitTools/record-memory-win/main.cpp -crlf
 WebKitTools/record-memory-win/record-memory-win.vcproj -crlf
+WebKitTools/TestResultServer/index.yaml -crlf
+WebKitTools/BuildSlaveSupport/win/kill-old-processes -crlf
+WebKitTools/MiniBrowser/MiniBrowser.vcproj -crlf
+WebKitTools/MiniBrowser/win/MiniBrowser.rc -crlf
+