From 0acbcf4bfd827df09c9e1f97c2b9073d4a07a7df Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 2 Jul 2013 21:25:38 +0200 Subject: Adding CocoaPods to gitignore --- Objective-C.gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Objective-C.gitignore') diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 31e6fd9a..5c579a76 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -15,3 +15,7 @@ profile DerivedData .idea/ *.hmap + +#CocoaPods +Podfile.lock +Pods -- cgit v1.2.3 From 444416f0678d0114b6901e69b6302d7db48ef04c Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Wed, 3 Jul 2013 08:28:28 -0700 Subject: Remove Podfile.lock from Objective-C ignores Per discussion in #148. --- Objective-C.gitignore | 1 - 1 file changed, 1 deletion(-) (limited to 'Objective-C.gitignore') diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 5c579a76..ebbef4bd 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -17,5 +17,4 @@ DerivedData *.hmap #CocoaPods -Podfile.lock Pods -- cgit v1.2.3 From 846f1ecbb2cfa1ac7bfb22330bacd62f28b312ff Mon Sep 17 00:00:00 2001 From: modocache Date: Wed, 10 Jul 2013 15:05:43 -0400 Subject: Ignore source control plist files generated by Xcode. --- Objective-C.gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'Objective-C.gitignore') diff --git a/Objective-C.gitignore b/Objective-C.gitignore index ebbef4bd..92a63cae 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -10,6 +10,7 @@ *.perspectivev3 !default.perspectivev3 xcuserdata +*.xccheckout profile *.moved-aside DerivedData -- cgit v1.2.3 From 56dbce3df3b19eb61563d56ce13b01e0fcbf7ae8 Mon Sep 17 00:00:00 2001 From: Bart Date: Tue, 17 Sep 2013 12:42:12 +0200 Subject: add .xccheckout to Objective-C gitignore This is a file that Xcode 5 uses for version control, doesn't need to be checked in. Also see http://stackoverflow.com/a/18448100/1877078 --- Objective-C.gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'Objective-C.gitignore') diff --git a/Objective-C.gitignore b/Objective-C.gitignore index ebbef4bd..6e137049 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -15,6 +15,7 @@ profile DerivedData .idea/ *.hmap +*.xccheckout #CocoaPods Pods -- cgit v1.2.3 From ebe2e3e57034541eb60360af2c1b40e1d67f874f Mon Sep 17 00:00:00 2001 From: Trevor Sheridan Date: Mon, 4 Nov 2013 15:33:14 -0700 Subject: Cleaning up Objective-C .gitignore and adding OS X section --- Objective-C.gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Objective-C.gitignore') diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 6e137049..7e875451 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -1,5 +1,7 @@ -# Xcode +# OS X .DS_Store + +# Xcode */build/* *.pbxuser !default.pbxuser @@ -17,5 +19,5 @@ DerivedData *.hmap *.xccheckout -#CocoaPods +# CocoaPods Pods -- cgit v1.2.3