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

diff --git a/.gitattributes b/.gitattributes
index 46ca454..06b03f9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,20 @@
+# To enable automatic merging of ChangeLog files, use the following command:
+# 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
@@ -235,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
@@ -267,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
+