docs/gitignore
docs/gitignore
1
0
Fork 0
mirror of https://github.com/github/gitignore synced 2024-11-26 05:34:21 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix-1022'

Browse Source 
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.
This commit is contained in:
Carl Suster 2014-04-06 10:38:40 +10:00
commit b3d27fcf04
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Global/Xcode.gitignore
View File

@ -11,5 +11,3 @@ xcuserdata
*.xccheckout *.xccheckout
*.moved-aside *.moved-aside
DerivedData DerivedData
*.hmap
*.ipa

19
Objective-C.gitignore
View File

@ -1,3 +1,21 @@
# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
# CocoaPods # CocoaPods
# #
# We recommend against adding the Pods directory to your .gitignore. However # We recommend against adding the Pods directory to your .gitignore. However
@ -5,4 +23,3 @@
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control? # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
# #
# Pods/ # Pods/