Commit Graph

2162 Commits

Author SHA1 Message Date
Abhishek Kumar Singh
83656adb09 Merge branch 'master' of github.com:github/gitignore into patch-1
Conflicts:
	Python.gitignore
2016-03-07 11:51:09 +05:30
Brendan Forster
028ed4e1b1 Merge pull request #1452 from nunorafaelrocha/enhancement/add-spool-folder
Add spool folder to Symfony
2016-03-07 08:46:42 +11:00
Brendan Forster
8e7920ac1c Merge pull request #1892 from hippo91/master
No need to push .spyderproject file in a python project
2016-03-07 07:49:48 +11:00
Brendan Forster
615b18d378 Merge pull request #1811 from Caerbannog/master
KiCAD: ignore more temp files and generated data
2016-03-07 07:49:23 +11:00
Martin d'Allens
4db34a4cb9 Remove OSX specific rule 2016-03-06 17:21:06 +01:00
Martin d'Allens
17a0db2466 KiCAD: ignore more temp files and generated data 2016-03-06 17:21:06 +01:00
hippo91
49a480951e No need to push .spyderproject file in a python project 2016-03-06 12:30:45 +01:00
Dinar Garipov
8e6c678f11 Added nore ignores. Removed.env example file 2016-03-06 11:51:52 +01:00
Brendan Forster
fed72cc405 Merge pull request #1764 from psantos10/patch-1
Update CakePHP.gitignore
2016-03-06 21:43:28 +11:00
Brendan Forster
16a9e9bf8a Merge pull request #1550 from photodude/patch-1
Add the other Dreamweaver added files
2016-03-06 20:26:29 +11:00
Brendan Forster
f6fb77ef8e Merge pull request #1781 from mkutyba/master
Fixes for Magento
2016-03-06 19:28:14 +11:00
Brendan Forster
b7c949a108 Merge pull request #1707 from jeanCarloMachado/master
Added doctrine 2 orm default cache and proxy locations
2016-03-06 19:23:23 +11:00
Brendan Forster
340fcf1e13 Merge pull request #1736 from maidmaid/prestashop-cache
Update cache files in Prestashop.gitignore
2016-03-06 19:18:29 +11:00
Brendan Forster
363632ae65 Merge pull request #1655 from sourcerer-mike/develop-WordPress
WordPress: Only ignore files in root to support other plugins
2016-03-06 19:14:41 +11:00
Brendan Forster
4596d11577 Merge pull request #1684 from jimhester/patch-1
Ignore output from R CMD build and R CMD check
2016-03-06 19:13:35 +11:00
Brendan Forster
c3f81054bc Merge pull request #1664 from littleibex/master
Added .htaccess to concrete5 gitignore
2016-03-06 19:12:42 +11:00
Brendan Forster
bd11089247 Merge pull request #1624 from wikibootup/master
Add Scheme.gitignore
2016-03-06 19:08:56 +11:00
Brendan Forster
b35f448d64 Merge pull request #1623 from sorabito/feature/Added_Smalltalk_gitignore
Add Smalltalk gitignore
2016-03-06 19:08:28 +11:00
Brendan Forster
83dc73e546 Merge pull request #1598 from rdalkire/patch-1
Update CVS.gitignore
2016-03-06 19:05:43 +11:00
Brendan Forster
bb217159e6 Merge pull request #1543 from barraponto/patch-2
Add scrapy stuff to .gitignore
2016-03-06 18:49:45 +11:00
Brendan Forster
f25321570e Merge pull request #1310 from kechol/fuelphp
Update FuelPHP.gitignore
2016-03-06 18:41:34 +11:00
Brendan Forster
988fd7a3d2 Merge pull request #1807 from rlee287/eclipse-recommender
Added Eclipse Recommenders to Eclipse gitignore
2016-03-06 18:36:39 +11:00
Brendan Forster
9e636ea96f Merge pull request #1867 from yoLotus/emacs-projectile
add .projectile file to emacs .gitignore
2016-03-06 18:35:35 +11:00
Brendan Forster
c6a8c5299d Merge pull request #1559 from tjrana/dropbox-gitignore
Add Dropbox.gitignore
2016-03-06 18:20:27 +11:00
Brendan Forster
8411714b31 Merge pull request #1889 from aholmes/master
Remove ApplicationInsights.config from VisualStudio.gitignore
2016-03-05 09:09:11 +11:00
Aaron Holmes
b2bacc5184 Remote ApplicationInsights.config from VisualStudio.gitignore
Commit a25589c921 introduced an ignore line for ApplicationInsights.config. This change breaks builds on certain systems, namely VSTS.

The current ASP.NET 4 template adds ApplicationInsights.config to the project's .csproj file. When VSTS attempts to build the project, it will fail if it cannot find ApplicationInsights.config.

ApplicationInsights.config is a required application file and should not be ignored.
2016-03-04 13:07:34 -08:00
Brendan Forster
1c70d149b5 Merge pull request #1885 from roll/patch-1
added dotenv to python gitignore
2016-02-29 07:50:47 +10:30
roll
b37d30f194 added dotenv to python gitignore 2016-02-28 19:57:21 +03:00
Brendan Forster
04e2448f8f Merge pull request #1882 from aaroncaito/terraform
adding terraform state files
2016-02-27 12:50:43 +11:00
Brendan Forster
e908f92f4b Merge pull request #1883 from github/shiftkey-patch-1
adding a template to help streamline review process
2016-02-27 12:49:18 +11:00
Brendan Forster
9b890f90e9 adding a template to help streamline review process 2016-02-27 12:48:40 +11:00
aaron caito
221f974e80 adding terraform state files 2016-02-26 11:54:57 -05:00
Brendan Forster
0f45616141 Merge pull request #1686 from czechboy0/keep-scm-files
Removed xccheckout and xcscmblueprint from Swift/Objc/Xcode
2016-02-26 11:18:34 +11:00
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
c4ff566a30 Merge pull request #1871 from guenti/master
Update Vim.gitignore
2016-02-26 08:18:26 +11:00
Brendan Forster
b4533d233b Merge pull request #1879 from rocketraman/patch-1
Update Jetbrains .gitignore dataSources.local.xml
2016-02-26 07:59:25 +11:00
Raman Gupta
2141c823b4 Update Jetbrains .gitignore dataSources.local.xml 2016-02-25 11:57:01 -05:00
Abhishek Kumar Singh
a623e9e6d4 Update Python.gitignore for celery-beat schedule binary file. 2016-02-25 12:27:21 +05:30
Brendan Forster
0106b2b10f Merge pull request #1875 from jutoft/master
Add *.glsdefs to TeX.gitignore
2016-02-25 11:50:05 +11:00
Brendan Forster
0c318a6298 Merge pull request #1876 from ezekeal/patch-1
removed elm-package.json
2016-02-25 09:21:44 +11:00
Zach Koch
a623b2fbe8 removed elm-package.json
elm-package.json lists dependencies, so it shouldn't be ignored
2016-02-24 16:03:31 -06:00
Jesper Utoft
02903096d3 Add glsdefs to TeX.gitignore 2016-02-24 11:27:39 +01:00
Brendan Forster
9f8e411bba Merge pull request #1853 from Zenuka/bower_components
Add bower_components to VisualStudio.gitignore
2016-02-24 12:00:08 +11:00
Mario Guenterberg
504f444dfa Update Vim.gitignore
Added auto-generated tag files.
2016-02-22 17:50:16 +01:00
Etienne Bazin
413049c283 add .projectile file to emacs .gitignore 2016-02-19 10:12:44 +01:00
Brendan Forster
a392c48ccf Merge pull request #1865 from hmemcpy/patch-1
Adding JetBrains Rider (.NET IDE from JetBrains) specific files
2016-02-18 18:39:26 +11:00
Igal Tabachnik
e429db1180 Adding JetBrains Rider (.NET IDE from JetBrains) specific files to ignore 2016-02-18 09:31:24 +02:00
Brendan Forster
02950ad8fa Merge pull request #1864 from luxidea/patch-2
Add "__recovery" folder.
2016-02-17 10:57:57 +11:00
中山雅紀:Nakayama Masanori
16e076df2b Add "__recovery" folder. 2016-02-17 02:19:09 +09:00
Brendan Forster
5141423fba Merge pull request #1862 from SaschaNaz/patch-1
Ignore some Windows Store package related files
2016-02-16 20:34:03 +11:00