Skip to content

Commit

Permalink
Integrate the git instructions into the README
Browse files Browse the repository at this point in the history
  • Loading branch information
dulacp committed Dec 9, 2015
1 parent 547613c commit b96084c
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@ Job done for language: ./MyXcodeProjectDir/fr.lproj

By default `git` won't display diff for `.string` files encoded in UTF-16. However, you can [turn on UTF-16 diffs](http://blog.xk72.com/post/31456986659/diff-strings-files-in-git) if you want to.

Create a `.gitattributes` file at your repository root

```ruby
*.strings diff=localizablestrings
```

Then edit your `~/.gitconfig` file add add the following :

```ruby
[diff "localizablestrings"]
textconv = "iconv -f utf-16 -t utf-8"
```

## Known Issues

* genstrings doesn't like path containing spaces, so avoid subfolders containing spaces.
Expand Down

0 comments on commit b96084c

Please sign in to comment.