aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* KiCAD: ignore more temp files and generated dataMartin d'Allens2016-03-061-0/+10
|
* Merge pull request #1764 from psantos10/patch-1Brendan Forster2016-03-061-1/+13
|\ | | | | Update CakePHP.gitignore
| * Update CakePHP.gitignorePatrĂ­cio dos Santos2015-11-201-1/+13
| | | | | | Ignore all tmp and log files but preserve the directory structure
* | Merge pull request #1550 from photodude/patch-1Brendan Forster2016-03-061-0/+4
|\ \ | | | | | | Add the other Dreamweaver added files
| * | Add the other Dreamweaver added filesphotodude2015-06-111-0/+4
| | |
* | | Merge pull request #1781 from mkutyba/masterBrendan Forster2016-03-061-31/+9
|\ \ \ | | | | | | | | Fixes for Magento
| * | | exclude only community code that is shipped with MagentoMateusz Kutyba2015-12-031-2/+2
| | | |
| * | | exclude only locale en_USMateusz Kutyba2015-12-031-1/+1
| | | |
| * | | simplified rules for Mage* module filesMateusz Kutyba2015-12-031-20/+1
| | | |
| * | | simplified rules for media dirMateusz Kutyba2015-12-031-8/+1
| | | |
| * | | new files added in 1.9.2.xMateusz Kutyba2015-12-031-0/+4
| | | |
* | | | Merge pull request #1707 from jeanCarloMachado/masterBrendan Forster2016-03-061-0/+5
|\ \ \ \ | | | | | | | | | | Added doctrine 2 orm default cache and proxy locations
| * | | | added doctrine 2 orm default cache and proxy locationsJean Carlo Machado2015-10-191-0/+5
| | | | |
* | | | | Merge pull request #1736 from maidmaid/prestashop-cacheBrendan Forster2016-03-061-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Update cache files in Prestashop.gitignore
| * | | | | Update Prestashop.gitignoreDany Maillard2015-11-041-1/+8
| | | | | |
* | | | | | Merge pull request #1655 from sourcerer-mike/develop-WordPressBrendan Forster2016-03-061-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | WordPress: Only ignore files in root to support other plugins
| * | | | | | WordPress: Only ignore files in root to support other pluginsMike Pretzlaw2015-09-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most files are ignores without defining the directory. This caused trouble with several plugins. To fix that some files should only be ignored in the root directory. - .htaccess is only ignored in the root directory due to some plugins or devs that need and create the htaccess for security issues in subfolders - sitemap.xml and sitemap.xml.gz is only ignored in the root directory due to plugins that have an equal name and are therefor ignored - Those files are ordered alphabetically
* | | | | | | Merge pull request #1684 from jimhester/patch-1Brendan Forster2016-03-061-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ignore output from R CMD build and R CMD check
| * | | | | | | Ignore output from R CMD build and R CMD checkJim Hester2015-10-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Both rules are restricted to the top level only, so `*.tar.gz` files in data directories for instance will _not_ be ignored.
* | | | | | | | Merge pull request #1664 from littleibex/masterBrendan Forster2016-03-061-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added .htaccess to concrete5 gitignore
| * | | | | | | | Added .htaccess to concrete5 gitignorelittleibex2015-09-201-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1624 from wikibootup/masterBrendan Forster2016-03-061-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Scheme.gitignore
| * | | | | | | | Add Scheme.gitignorewikibootup2015-08-221-0/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #1623 from sorabito/feature/Added_Smalltalk_gitignoreBrendan Forster2016-03-061-0/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Smalltalk gitignore
| * | | | | | | | | Add Smalltalk gitignorenewapplesho2015-08-221-0/+18
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1598 from rdalkire/patch-1Brendan Forster2016-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update CVS.gitignore
| * | | | | | | | | | Update CVS.gitignorerdalkire2015-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I added and tested another leading asterisk to deal with the CVS directories further down the tree.
* | | | | | | | | | | Merge pull request #1543 from barraponto/patch-2Brendan Forster2016-03-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add scrapy stuff to .gitignore
| * | | | | | | | | | | Add scrapy stuff to .gitignoreCapi Etheriel2015-06-051-0/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1310 from kechol/fuelphpBrendan Forster2016-03-061-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update FuelPHP.gitignore
| * | | | | | | | | | | | update FuelPHP.gitignoreKazuyuki SUZUKI2014-12-081-2/+21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1807 from rlee287/eclipse-recommenderBrendan Forster2016-03-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Eclipse Recommenders to Eclipse gitignore
| * | | | | | | | | | | | | Added Eclipse Recommenders to Eclipse gitignorerlee2872015-12-191-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1867 from yoLotus/emacs-projectileBrendan Forster2016-03-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add .projectile file to emacs .gitignore
| * | | | | | | | | | | | | | add .projectile file to emacs .gitignoreEtienne Bazin2016-02-191-0/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1559 from tjrana/dropbox-gitignoreBrendan Forster2016-03-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Dropbox.gitignore
| * | | | | | | | | | | | | | | Add Dropbox.gitignoreTJ Rana2015-06-181-0/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #1889 from aholmes/masterBrendan Forster2016-03-051-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ApplicationInsights.config from VisualStudio.gitignore
| * | | | | | | | | | | | | | | | Remote ApplicationInsights.config from VisualStudio.gitignoreAaron Holmes2016-03-041-3/+0
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit a25589c92187674f68dcfafe8433e0c1e6069159 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.
* | | | | | | | | | | | | | | | Merge pull request #1885 from roll/patch-1Brendan Forster2016-02-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added dotenv to python gitignore
| * | | | | | | | | | | | | | | | added dotenv to python gitignoreroll2016-02-281-0/+2
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #1882 from aaroncaito/terraformBrendan Forster2016-02-271-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding terraform state files
| * | | | | | | | | | | | | | | | adding terraform state filesaaron caito2016-02-261-0/+3
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #1883 from github/shiftkey-patch-1Brendan Forster2016-02-271-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | adding a template to help streamline review process
| * | | | | | | | | | | | | | | | adding a template to help streamline review processBrendan Forster2016-02-271-0/+11
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #1686 from czechboy0/keep-scm-filesBrendan Forster2016-02-262-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed xccheckout and xcscmblueprint from Swift/Objc/Xcode
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:github/gitignore into keep-scm-filesHonza Dvorsky2016-02-2651-70/+424
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Objective-C.gitignore # Swift.gitignore
* | | | | | | | | | | | | | | | | Merge pull request #1871 from guenti/masterBrendan Forster2016-02-261-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Vim.gitignore
| * | | | | | | | | | | | | | | | | Update Vim.gitignoreMario Guenterberg2016-02-221-0/+2
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added auto-generated tag files.
* | | | | | | | | | | | | | | | | Merge pull request #1879 from rocketraman/patch-1Brendan Forster2016-02-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Jetbrains .gitignore dataSources.local.xml