From 9707fd125c5e7567c1bc6fa1f75a69bac4508062 Mon Sep 17 00:00:00 2001 From: Konstantin Koval Date: Mon, 31 Mar 2014 08:37:35 +0200 Subject: [PATCH 1/3] put back Xcode ignore to Objective-C. --- Objective-C.gitignore | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index d522f941..278782fc 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -1,3 +1,22 @@ +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +profile +*.moved-aside +DerivedData +*.hmap +*.ipa + # CocoaPods # # We recommend against adding the Pods directory to your .gitignore. However From 336dd397ffc23f66107bf7c71195e4578bb761d7 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sun, 6 Apr 2014 10:35:58 +1000 Subject: [PATCH 2/3] Remove profile from Obj-C to match #956 --- Objective-C.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 278782fc..35a6fbdd 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -11,7 +11,6 @@ build/ !default.perspectivev3 xcuserdata *.xccheckout -profile *.moved-aside DerivedData *.hmap From 5f4223833162b45377e9900b6da8340f5992dc82 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sun, 6 Apr 2014 10:38:24 +1000 Subject: [PATCH 3/3] Remove Obj-C-specific hmap & ipa from general Xcode template --- Global/Xcode.gitignore | 2 -- Objective-C.gitignore | 1 - 2 files changed, 3 deletions(-) diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 3756dc05..30986799 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -12,5 +12,3 @@ xcuserdata profile *.moved-aside DerivedData -*.hmap -*.ipa diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 35a6fbdd..8f9935da 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -23,4 +23,3 @@ DerivedData # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control? # # Pods/ -