Teach git about localizable *.strings files

<http://webkit.org/b/88447>

Reviewed by Adam Roben.

* .gitattributes: Set diff attribute for *.strings files so
git-diff doesn't complain about them being binary files once the
git-config command is run.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@119619 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index 781227ce5fc5a79c2e90224a6599734a43afc861..56a55c603f0c3be72c488709a537b5da1ac2a5af 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,6 +14,10 @@ objc/*.h diff=objcppheader
 */objc/*.h diff=objcppheader
 */*/objc/*.h diff=objcppheader
 
+# To enable smart diffing of *.strings files, run the following command:
+# git config diff.localizablestrings.textconv "iconv -f utf-16 -t utf-8"
+*.strings diff=localizablestrings
+
 *.vcproj eol=crlf
 *.vsprops eol=crlf
 *.sln eol=crlf

diff --git a/ChangeLog b/ChangeLog
index 26e88192aa7a962e8819a74761db2bd151db9dec..4b4518fcf8d0512be4a732b13090c24bb8cc7c01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-06-06  David Kilzer  <ddkilzer@apple.com>
+
+        Teach git about localizable *.strings files
+        <http://webkit.org/b/88447>
+
+        Reviewed by Adam Roben.
+
+        * .gitattributes: Set diff attribute for *.strings files so
+        git-diff doesn't complain about them being binary files once the
+        git-config command is run.
+
 2012-06-06  Andy Wingo  <wingo@igalia.com>
 
         [GTK] Enable the LLInt