diff options
| author | aroben@apple.com <aroben@apple.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2010-03-11 20:01:32 +0000 |
|---|---|---|
| committer | aroben@apple.com <aroben@apple.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2010-03-11 20:01:32 +0000 |
| commit | 64d132164677168cb0da794ff8a06984416292d0 (patch) | |
| tree | b3e95c2d0f0d848fbbee393bf8361dd62fd60b3a /third_party/WebKit/.gitattributes | |
| parent | 0310a6c8cea2c8762cb0b8c0285eadfabd9146ec (diff) | |
| download | chromium_src-64d132164677168cb0da794ff8a06984416292d0.zip chromium_src-64d132164677168cb0da794ff8a06984416292d0.tar.gz chromium_src-64d132164677168cb0da794ff8a06984416292d0.tar.bz2 | |
Teach git about ObjC files
Fixes <http://webkit.org/b/36015>.
Reviewed by Tim Hatcher.
* .gitattributes: Set the diff attribute for .m and .mm files, and .h
files in Mac-specific directories. This can be used to generate
more-readable diffs of ObjC files.
git-svn-id: svn://svn.chromium.org/blink/trunk@55851 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/.gitattributes')
| -rw-r--r-- | third_party/WebKit/.gitattributes | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/third_party/WebKit/.gitattributes b/third_party/WebKit/.gitattributes index 80386ae..f6df8bb 100644 --- a/third_party/WebKit/.gitattributes +++ b/third_party/WebKit/.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 |