Commit Graph

25 Commits

Author SHA1 Message Date
Carl Suster 1ef80036f0 Remove .idea/ from ObjectiveC in favour of Global/IDEA 2013-11-09 07:37:49 +11:00
Michael Gerbush 95075cccba Merge branch 'master' into patch-1
Conflicts:
	Objective-C.gitignore
2013-11-07 13:04:32 -06:00
Adam Roben 908bb556d1 Merge pull request #827 from trevorsheridan/master
Cleaning up Objective-C .gitignore and adding OS X section
2013-11-05 08:36:38 -08:00
Trevor Sheridan ebe2e3e570 Cleaning up Objective-C .gitignore and adding OS X section 2013-11-04 15:33:14 -07:00
Adam Roben ca5c02406c Merge pull request #703 from modocache/master
Ignore source control plist files generated by Xcode.
2013-11-04 05:28:59 -08:00
Bart 56dbce3df3 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
2013-09-17 12:42:12 +02:00
modocache 846f1ecbb2 Ignore source control plist files generated by Xcode. 2013-07-10 15:05:43 -04:00
Justin Spahr-Summers 444416f067 Remove Podfile.lock from Objective-C ignores
Per discussion in #148.
2013-07-03 08:28:28 -07:00
Matthias Wessendorf 0acbcf4bfd Adding CocoaPods to gitignore 2013-07-02 21:25:38 +02:00
Michael Gerbush 182aeb220d Reverting change to ignore build subdirectories
Reverted a change that was causing build directories at the root folder to show up in git.  If you need to ignore subdirectories the leading slash needs to be omitted.
2013-05-02 23:04:52 -05:00
Eloy Durán e54e1b752b [Objective-C] No longer ignore `xcworkspace` documents.
Workspaces are real documents that can be opened, just like `xcodeproj`
documents. These documents are also generated/used by CocoaPods to
configure a project’s dependencies. For these reasons, there does not
seem a good reason to ignore these any longer.
2013-01-15 11:33:57 +01:00
Vasyl Liutikov 74e12d9cb7 ignore all build directories in subdirectories 2012-08-27 14:01:57 +03:00
Vasyl Liutikov 392a91e792 add *.hmap 2012-08-27 14:00:59 +03:00
Justin Spahr-Summers f1cb24b9c2 Merge remote-tracking branch 'stig/patch-1'
Conflicts:
	Objective-C.gitignore
2012-08-27 03:29:25 -07:00
Justin Spahr-Summers 8486f22049 Merge remote-tracking branch 'OliverLetterer/patch-1'
Conflicts:
	Objective-C.gitignore
2012-08-02 19:02:06 -07:00
Joachim Bondo 1365cd43f7 Update to also ignore .DS_Store files 2012-07-11 15:19:29 +03:00
Stig Brautaset 6670a4c423 Ignore .idea/ folder for AppCode users. 2012-05-01 22:11:46 +02:00
Oliver Letterer 0a9d0c31e8 Now ignoring full build directory. 2012-04-21 09:59:57 +03:00
StuFF mc f06364113f DerivedData is the "build/" Folder that *might* be in your Project's folder if you use the default Xcode 4 settings. 2012-01-28 12:42:12 +01:00
Daniel Schildt e58baf9625 Fixed comment in Objective-C.gitignore 2010-11-13 05:54:52 +08:00
Peat Bakke 4f13b9342f Removing .DS_Store; specific to OS X, and redundant with Global/OSX 2010-11-10 03:40:34 +08:00
rentzsch ea6e9227f8 Support defaulting user-specific Xcode project settings. 2010-11-08 14:44:09 -08:00
Mark Lussier 5c2a78f44f added line to Objective-C gitignore to ignore the *.moved-aside files from XCode 2010-11-09 06:42:21 +08:00
Sam Soffes f3691245df Ignore Xcode 4 user configurations for Objective-C 2010-11-09 06:41:19 +08:00
Chris Wanstrath b7cc33a99b begin! add Rails and Obj-C templates 2010-11-08 12:21:45 -08:00