Changeset 55851 in webkit

Timestamp:

Mar 11, 2010 12:01:32 PM (14 years ago)

Author:

Adam Roben

Message:

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.

Location:

trunk

Files:

• .gitattributes (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/.gitattributes

@@ -2 +2 @@
 # 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

trunk/ChangeLog

@@ +1 @@
+2010-03-11  Adam Roben  <aroben@apple.com>
+
+        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.
+
 2010-03-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>