Created
January 16, 2013 20:05
-
-
Save CocoaBeans/4550380 to your computer and use it in GitHub Desktop.
Common .gitattributes for Cocoa development
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ################################################## | |
| ## Attribute for diff'ing UTF-8 .strings files | |
| *.strings -crlf set diff | |
| ################################################## | |
| ## Attribute to for easy merging of Xcode project files | |
| *.pbxproj merge=union |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment