summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/.gitattributes
diff options
context:
space:
mode:
authorddkilzer@apple.com <ddkilzer@apple.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2012-06-06 21:19:38 +0000
committerddkilzer@apple.com <ddkilzer@apple.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2012-06-06 21:19:38 +0000
commit67444e594b3cd29e0d895ad4b7abce4c9d4a4e15 (patch)
treec1db325ee15783cf8b92cacde48ddfed3bc6dae7 /third_party/WebKit/.gitattributes
parente33686e5a0d4279c0beb72704b4fb21addefd465 (diff)
downloadchromium_src-67444e594b3cd29e0d895ad4b7abce4c9d4a4e15.zip
chromium_src-67444e594b3cd29e0d895ad4b7abce4c9d4a4e15.tar.gz
chromium_src-67444e594b3cd29e0d895ad4b7abce4c9d4a4e15.tar.bz2
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: svn://svn.chromium.org/blink/trunk@119619 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/.gitattributes')
-rw-r--r--third_party/WebKit/.gitattributes4
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/WebKit/.gitattributes b/third_party/WebKit/.gitattributes
index 781227c..56a55c6 100644
--- a/third_party/WebKit/.gitattributes
+++ b/third_party/WebKit/.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