Created
May 24, 2012 03:06
-
-
Save sprhawk/2779208 to your computer and use it in GitHub Desktop.
git diff localizable.strings
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(from :http://www.entropy.ch/blog/Developer/2010/04/15/Git-diff-for-Localizable-strings-Files.html) | |
First, add this to the project’s .git/info/attributes file: | |
+ | |
*.strings diff=localizablestrings | |
(Unfortunately you do have to add it to every project, there doesn’t seem to be a global attributes configuration file) | |
Second, add this to your ~/.gitconfig file: | |
+ | |
[diff "localizablestrings"] | |
textconv = "iconv -f utf-16 -t utf-8" |
Works like a charm with Tower, thx.
Here's my .gitattributes
located in project's root:
*.strings diff=localizablestrings
[diff "localizablestrings"]
textconv = "iconv -f utf-16 -t utf-8"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Thanks for the gist. This works for me locally with git and Sourcetree. But this isn't helping with the diffs in GitHub pull requests. The diffs do not show on the strings files. Anyone has ideas on how to get that to work?