Skip to content

Instantly share code, notes, and snippets.

@asmallteapot

asmallteapot/.gitattributes

Last active September 15, 2024 12:58
Download ZIP

Revisions

  1. asmallteapot renamed this gist Apr 23, 2014. 1 changed file with 0 additions and 0 deletions.
    0 __README.md → README.md
    View file
    File renamed without changes.
  2. asmallteapot created this gist Apr 23, 2014.
    1 change: 1 addition & 0 deletions .gitattributes
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1 @@
    *.strings utf16 diff=localizablestrings
    3 changes: 3 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,3 @@
    [diff "localizablestrings"]
    textconv = "iconv -f utf-16 -t utf-8"
    binary = false
    7 changes: 7 additions & 0 deletions __README.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,7 @@
    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.