Web Inspector: support better git diff of localizedStrings.js
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Feb 2015 19:57:46 +0000 (19:57 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Feb 2015 19:57:46 +0000 (19:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=137237

Reviewed by Joseph Pecoraro.

* .gitattributes: Added.

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

Source/WebInspectorUI/.gitattributes [new file with mode: 0644]
Source/WebInspectorUI/ChangeLog

diff --git a/Source/WebInspectorUI/.gitattributes b/Source/WebInspectorUI/.gitattributes
new file mode 100644 (file)
index 0000000..e2fcc8c
--- /dev/null
@@ -0,0 +1,3 @@
+# To enable smart diffing of localizedStrings.js, run the following command:
+# git config diff.localizablestrings.textconv "iconv -f utf-16 -t utf-8"
+localizedStrings.js diff=localizablestrings
index d877d30..6131a7f 100644 (file)
@@ -1,3 +1,12 @@
+2015-02-13  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: support better git diff of localizedStrings.js
+        https://bugs.webkit.org/show_bug.cgi?id=137237
+
+        Reviewed by Joseph Pecoraro.
+
+        * .gitattributes: Added.
+
 2015-02-12  Brian J. Burg  <burg@cs.washington.edu>
 
         Web Inspector: add keyboard shortcut to enable/disable all breakpoints