]> source.dussan.org Git - gitignore.git/commit
projects / gitignore.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f21b38a 5f42238)
Merge branch 'fix-1022'
authorCarl Suster <carl@contraflo.ws>
Sun, 6 Apr 2014 00:38:40 +0000 (10:38 +1000)
committerCarl Suster <carl@contraflo.ws>
Sun, 6 Apr 2014 00:38:40 +0000 (10:38 +1000)
commitb3d27fcf04fa9d8346278d0720bf4cbe0aaee6a4
tree1098130ceb2133c6e72e59d234feda0bf43d4306tree | snapshot
parentf21b38a70da5036d52b004f8c6e550575230d20ecommit | diff
parent5f4223833162b45377e9900b6da8340f5992dc82commit | diff
Merge branch 'fix-1022'

Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.
Global/Xcode.gitignore diff1 | diff2 | blob | history
A collection of useful .gitignore templates: https://github.com/github/gitignore