git diff localizable.strings

gistfile1.txt

(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"

Thanks for this one 👍

Broke the diff for Localizable.strings... ☹️

@anoez add binary = false

@TosinAF, add binary = false to what?
To the .gitattributes file, or the [diff "localizablestrings"] part?

FYI @axello @TosinAF I didn't find binary=false necessary.

Also there is a user-global configuration file for git attributes that you can add *.strings diff=localizablestrings to:

~/.config/git/attributes on my OSX.

The exact location for you might be either $XDG_CONFIG_HOME/git/attributes or $HOME/.config/git/attributes (see https://git-scm.com/docs/gitattributes for exact rules)

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?

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"