1
0
mirror of https://github.com/github/gitignore synced 2024-11-22 19:54:22 +01:00

Merge pull request #1514 from bbodenmiller/xcode

sync up xcode related gitignore files
This commit is contained in:
Carl Suster 2015-05-30 13:48:41 +10:00
commit 28adf703c1
3 changed files with 39 additions and 5 deletions

View File

@ -1,4 +1,12 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/ build/
DerivedData
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
@ -8,7 +16,8 @@ build/
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata
## Other
*.xccheckout *.xccheckout
*.moved-aside *.moved-aside
DerivedData
*.xcuserstate *.xcuserstate

View File

@ -1,6 +1,12 @@
# Xcode # Xcode
# #
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/ build/
DerivedData
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
@ -10,12 +16,15 @@ build/
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata
## Other
*.xccheckout *.xccheckout
*.moved-aside *.moved-aside
DerivedData *.xcuserstate
## Obj-C/Swift specific
*.hmap *.hmap
*.ipa *.ipa
*.xcuserstate
# CocoaPods # CocoaPods
# #
@ -24,3 +33,10 @@ DerivedData
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# #
#Pods/ #Pods/
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Build

View File

@ -1,6 +1,12 @@
# Xcode # Xcode
# #
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/ build/
DerivedData
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
@ -10,12 +16,15 @@ build/
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata
## Other
*.xccheckout *.xccheckout
*.moved-aside *.moved-aside
DerivedData *.xcuserstate
## Obj-C/Swift specific
*.hmap *.hmap
*.ipa *.ipa
*.xcuserstate
# CocoaPods # CocoaPods
# #