# 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 *.vcproj eol=crlf *.vsprops eol=crlf *.sln eol=crlf # For best performance, place rules for deep paths in the parent directory. # For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here, # place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes WebKit/chromium/src/EventListenerWrapper.cpp -crlf WebKit/chromium/src/EventListenerWrapper.h -crlf WebKit/chromium/src/WebEventListener.cpp -crlf WebKit/chromium/src/WebEventListenerPrivate.cpp -crlf WebKit/chromium/src/WebEventListenerPrivate.h -crlf WebKit/gtk/po/sr.po -crlf WebKit/gtk/po/sr@latin.po -crlf WebKit/qt/tests/qwebframe/resources/testiframe.html -crlf WebKit/qt/tests/qwebframe/resources/testiframe2.html -crlf WebKit/win/COMPropertyBag.h -crlf WebKit/win/COMVariantSetter.h -crlf WebKit/win/Interfaces/IWebEmbeddedView.idl -crlf WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl -crlf WebKit/win/WebCoreSupport/EmbeddedWidget.cpp -crlf WebKit/win/WebCoreSupport/EmbeddedWidget.h -crlf WebKit/win/WebCoreSupport/WebInspectorDelegate.h -crlf WebKit/win/WebIconFetcher.cpp -crlf WebKit/win/WebIconFetcher.h -crlf