1
0
mirror of https://github.com/github/gitignore synced 2024-11-01 01:28:44 +01:00
Commit Graph

13 Commits

Author SHA1 Message Date
Justin Hartman
837181e2f6 Updated Xcode.gitignore template with a Patch (#2566) 2019-05-12 10:24:48 -03:00
Antoine Cœur
0a23ed588d
Revert "Update Xcode.gitignore" 2018-10-29 13:56:28 +08:00
Fidel Esteban Morales Cifuentes
f19d2a5171
Update Xcode.gitignore
Updating file to match the one for swift and objective c.
2018-06-30 20:19:22 -06:00
Antoine Cœur
81d78706fa clarifying when ignoring is not required 2017-06-08 14:14:58 +08: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
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
Elvis Nuñez
37372e0f64 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, this is something that shouldn't be tracked in version control
2014-04-15 18:59:29 +02:00
Carl Suster
b3d27fcf04 Merge branch 'fix-1022'
Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.
2014-04-06 10:38:40 +10:00
Carl Suster
5f42238331 Remove Obj-C-specific hmap & ipa from general Xcode template 2014-04-06 10:38:24 +10:00
Jim Roepcke
d598b29b04 Remove profile rule from Xcode template. Fixes #956 2014-04-04 17:21:06 +11:00
Ivan Zuzak
5342e13bc9 ensure single trailing newline 2014-03-27 17:04:56 +01:00
MacPro: Fabien Sanglard
5bd4330b8c Add Xcode support. 2014-03-19 19:14:15 -04:00