Git v1.8.4 has no idea how to diff Xcode .strings files. Here's how to fix that:
- Add the bit from
.gitconfig
to your~/.gitconfig
. - Add the bit from
.gitattributes
to your project's.gitattributes
file. This should be at the root of your project, if one doesn't already exist. - You should now be able to use
git diff
andgit add -p
with strings files.
The conversion seems to cause rendering issues for some non-Latin characters in iTerm2 v1.0.0.20140112 on Mac OS 10.9.2, but this doesn't affect the files themselves. If anyone knows how to fix this issue, please add a 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?