1
0
mirror of https://github.com/github/gitignore synced 2024-12-24 05:40:39 +01:00

51 Commits

Author SHA1 Message Date
Honza Dvorsky
272913dd9d Merge branch 'master' of github.com:github/gitignore into keep-scm-files
# Conflicts:
#	Objective-C.gitignore
#	Swift.gitignore
2016-02-26 00:07:20 +00:00
Brendan Forster
352c903c34 Merge pull request #1546 from Coeur/patch-1
DerivedData and xcuserdata are folders; *.xcuserstate is always inside
2016-01-27 15:27:31 +10:30
Nick Brook
97dc1fdfc3 Remove *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and Swift.gitignore 2015-11-19 00:24:34 +00:00
Felix Krause
3db9d96ecd Added link to more information about the available options 2015-11-12 00:11:58 +01:00
chenyufeng
84010e499f add *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and Swift.gitignore 2015-11-09 10:51:42 +08:00
Felix Krause
68ffe8de32 Added fastlane to iOS projects 2015-10-17 13:33:41 -07:00
Felix Krause
efea741860 Switched to https 2015-10-17 13:31:15 -07:00
Felix Krause
4f043859d8 Fixed whitespace 2015-10-17 13:30:55 -07:00
Honza Dvorsky
74aa37bfa4 Update Objective-C.gitignore 2015-10-03 01:15:46 +01:00
Antoine Cœur
f17925fe61 Merge branch 'master' into patch-1
* master: (24 commits)
  Add ignore for npm debug log files
  Add KiCad ignore for .bck and .kicad_pcb-bak
  Correct capitalisation of LightSwitch and omit generated.parameters.xml
  Add newline at EOF
  Add ignores for Visual Studio Lightswitch build output
  Adding optional ignore proposal for wwwroot folder
  Ignore NCrunch temporary files.
  Update Dart.gitignore
  Added .stack-work/ directory to Haskell .gitignore.
  add Android Studio to the covers list
  Ignore Default RSpec State File
  Ignore *.auxlock files created by TikZ in TeX
  Ignore files created by `\tikzexternalize`
  Update Typo3.gitignore for CMS v6.2
  [ObjC][Swift] Ignore Xcode SCM blueprint files
  include preamble files generated by mylatexformat package
  Add .jar, .exe and .msi
  Remove .SRCINFO (and old .AURINFO) from .gitignore
  Add CMakeScripts directory
  ignore OAuth2 token
  ...

Conflicts:
	Objective-C.gitignore
	Swift.gitignore
2015-08-15 22:35:32 +08:00
Brian Gesiak
4323f1e2c8 [ObjC][Swift] Ignore Xcode SCM blueprint files
These files are automatically generated by Xcode and maintain
information regarding source control. Xcode is typically used
in Objective-C and Swift projects, so add these to the ignored files for
these platforms.
2015-06-09 00:24:09 -04:00
Antoine Cœur
f85cff8fbe DerivedData and xcuserdata are folders; *.xcuserstate is always inside xcuserdata folder 2015-06-08 12:15:40 +02:00
Ben Bodenmiller
507c3949be sync up xcode related gitignore files
some details based on #1221
2015-05-10 05:21:36 -07:00
Victor Gama
9735a2cadf Update CocoaPods guide URL
This updates the link provided to the CocoaPods documentation regarding whether the Pods directory should be ignored or not.
2015-05-07 00:28:54 -03:00
riosc
d060ee0e57 removing aditional white space
removing this aditional white space avoid a mistake for beginners developers ignore the pod directory, because is confusing to note when they remove the '#' character and git still is tracking the pod dir.
2015-03-11 15:53:11 -03:00
Kyle Fuller
4ccd14486c [Objective-C] Fixes a broken link
This got changed recently.
2014-04-24 15:01:04 +01:00
Elvis Nuñez
af7c660e34 Ignore xcuserstate
xcuserstate files are generated from within Xcode and saved in your project bundle to remember your last opened file, the open state of any group folders, open tabs, and any other user setting your project might need to remember
2014-04-15 18:56:25 +02:00
Carl Suster
5f42238331 Remove Obj-C-specific hmap & ipa from general Xcode template 2014-04-06 10:38:24 +10:00
Carl Suster
336dd397ff Remove profile from Obj-C to match #956 2014-04-06 10:35:58 +10:00
Konstantin Koval
9707fd125c put back Xcode ignore to Objective-C. 2014-03-31 08:37:35 +02:00
MacPro: Fabien Sanglard
5bd4330b8c Add Xcode support. 2014-03-19 19:14:15 -04:00
Kyle Fuller
a3fbb9bd29 [Objective-C] Add a note about CocoaPod's Pods/ 2014-03-18 15:40:11 +00:00
Kyle Fuller
7609a2eb31 [Objective-C] Remove CocoaPods ignores
We shouldn't be ignoring these, it's down to the user and we shouldn't enforce them to ignore the `Pods/` directory

http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
2014-03-13 09:28:13 +00:00
Carl Suster
1446bd0044 Remove OSX-specific rule from ObjectiveC template 2014-03-07 00:20:51 +11:00
minsOne
e3fd044268 Added ipa file to Objective-C.gitignore 2013-11-27 14:40:07 +09:00
Matt Rubin
0ecd3eed99 Remove duplicate line in Objective-C.gitignore
The pattern `*.xccheckout` is already ignored on line 15.
2013-11-25 01:58:42 -05:00
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