Skip to content

Instantly share code, notes, and snippets.

@clementprem
Forked from asmallteapot/.gitattributes
Last active December 7, 2018 12:18
Show Gist options
  • Save clementprem/ec45eb2ae3abb38c51fed377c13e7443 to your computer and use it in GitHub Desktop.
Save clementprem/ec45eb2ae3abb38c51fed377c13e7443 to your computer and use it in GitHub Desktop.
Diff Xcode localizable strings files in Git.
*.strings utf16 diff=localizablestrings
[diff "localizablestrings"]
textconv = "iconv -f utf-16 -t utf-8"
binary = false

Git v1.8.4 has no idea how to diff Xcode .strings files. Here's how to fix that:

  1. Add the bit from .gitconfig to your ~/.gitconfig.
  2. 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.
  3. You should now be able to use git diff and git 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment