aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #1373 from wafiq/patch-1Carl Suster2015-01-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Typo in comment
| * | | | | Typo in commentWafiq Rodzuan2015-01-211-1/+1
|/ / / / / | | | | | | | | | | I know this is petty, but imagine thousand upon thousand of corrective commits saved by fixing the typo right into the heart of the file.
* | | | | Merge pull request #1364 from nwest/swift-carthageCarl Suster2015-01-161-0/+7
|\ \ \ \ \ | |/ / / / |/| | | | Add Carthage build folder and explaination
| * | | | Add Carthage build folder and explainationNate West2015-01-151-0/+7
|/ / / /
* | | | Merge Pull Request #1338 for EclipseCarl Suster2015-01-151-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1217. Once again ignore .classpath and .project in the Eclipse template. This has been requested in multiple PRs such as #1338 and #1221 and is essentially a reversion of #805. I copy the explanation for this change from the discussion in #1217 by @segfly: *In short*: I can't point to any counter-documentation off the top of my head. I just know from experience these files pollute a project's repo without adding value - that is, unless everyone contributing is using Eclipse and no-one is using dependency management. And even then, the guidance provided by the eclipse docs is bad advice. *In Long*: The .classpath file is used by Eclipse to maintain the project's classpath during automatic compile (every save of a file). In the olden days, one would manually configure the project within the Eclipse UI and include all the dependent jars necessary to compile your project. Eclipse then wrote that configuration out to the .classpath file. In theory, this file could be shared with others so they did not have to manually configure their eclipse classpath. In practice, I never saw it work out quite so well due to eventual bloating of the classpath with needless jars or jars that only existed on one person's machine. Mind you, many people back then also used to check their dependent jars into version control along with their source. Dependency management tools like Gradle and Maven have done away with all that of course. But they also integrate nicely with Eclipse and manage the project classpath dynamically. The .classpath file is basically rebuilt based on changes to the build.gradle file or pom.xml file. Effectively, this renders the whole point of checking in the .classpath moot as it is easily rebuilt by the Maven or Gradle plugin. The .project file is another animal completely. It basically describes what plugins should be applied to the project as configured in the Eclipse UI. Again the theory is it could be shared and creates a happy world. But due to different eclipse versions people may have, different plugins installed, etc. sharing the .project file actually causes more issues. And I've seen many projects unable to open due to a bad .project file - requiring one to delete it anyway (which then of course, when someone recreates it, they inevitably check it in over the old one and end up breaking someone else's environment). The bottom line is, regardless of what the eclipse documentation says, these are very much internal configuration files for eclipse and best left out of a repo.
| * | | | Added Eclipse JDT .classpath file, and the Eclipse core .project file toNicholas Pace2014-12-261-0/+6
| | | | | | | | | | | | | | | template
* | | | | Merge pull request #1285 from paolofulgoni/gradle-wrapperCarl Suster2015-01-151-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Avoid ignoring Gradle wrapper jar file
| * | | | | Avoid ignoring Gradle wrapper jar filePaolo Fulgoni2014-11-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is added because .jar files are usually ignored (see Java.gitignore)
* | | | | | Merge pull request #1306 from Hillkorn/patch-1Carl Suster2015-01-141-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added missing gradle netbeans directory
| * | | | | | Added missing gradle netbeans directoryDennis Schumann2014-12-041-0/+1
| | | | | | |
* | | | | | | Merge pull request #1353 from mbaltaks/patch-1Carl Suster2015-01-141-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ignore the pip self check marker file in a Virtualenv.
| * | | | | | | Ignore the pip self check marker file in a Virtualenv.Michael Baltaks2015-01-101-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #1362 from stevelacy/masterCarl Suster2015-01-141-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add .Trash-* to ignore Linux partition or ext disk trash folders
| * | | | | | | | add .Trash-* to ignore Linux partition or ext disk trash foldersSteve Lacy2015-01-131-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #1359 from masgo/masterCarl Suster2015-01-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update TeX.gitignore
| * | | | | | | Update TeX.gitignoreRob2015-01-131-0/+1
|/ / / / / / / | | | | | | | | | | | | | | *.synctex is generated when the synctex option is used under Windows.
* | | | | | | Merge pull request #1311 from rafaelstz/patch-1Carl Suster2015-01-081-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | root sitemap.xml
| * | | | | | | root sitemap.xmlRafael CorrĂȘa Gomes2014-12-081-0/+1
| |/ / / / / / | | | | | | | | | | | | | | The Magento production is configured to automatically generate the sitemap.xml, as is the url is taken as a base, it is important to be ignored.
* | | | | | | Merge pull request #1344 from tral/masterCarl Suster2015-01-081-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Built application files (for Android Studio projects)
| * | | | | | | movedtralchonok2015-01-071-3/+1
| | | | | | | |
| * | | | | | | # Built application files (for Android Studio projects)tralchonok2015-01-021-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1349 from MOROZILnic/patch-1Carl Suster2015-01-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update VisualStudio.gitignore
| * | | | | | | Update VisualStudio.gitignoreMOROZILnic2015-01-041-1/+1
| |/ / / / / / | | | | | | | | | | | | | | Ignoring *.cache as well as *.Cache
* | | | | | | Merge pull request #1257 from sidewinder94/patch-1Carl Suster2015-01-071-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ignoring Pow environment settings (Rails)
| * | | | | | | Removed .powconfig lineAntoine-Ali Zarrouk2014-11-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Couldn't find any references to .powconfig being used in application directory
| * | | | | | | Targeted more specifically pow filesAntoine-Ali Zarrouk2014-11-181-1/+2
| | | | | | | |
| * | | | | | | Ignoring Pow environment settingsAntoine-Ali Zarrouk2014-10-211-0/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1303 from vladon/masterCarl Suster2015-01-071-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added Castalia *.stat files
| * | | | | | | Added Castalia *.stat filesVladislav Yaroslavlev2014-12-011-0/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Castalia is a free plugin for Delphi since XE7. It uses *.stat files to save statistics of the IDE usage for each project (compile time, debug time etc.) It is safe to delete it, and it is useless to move *.stat files between developers (each developer has its own IDE statistics).
* | | | | | | Merge pull request #1288 from cake17/add-cakephp3Carl Suster2015-01-071-7/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add rules for new CakePHP 3
| * | | | | | | rearrange rules for CakePHP 2cake172015-01-041-7/+4
| | | | | | | |
| * | | | | | | add rules for new CakePHP 3cake172014-11-201-0/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1286 from adamliter/masterCarl Suster2015-01-071-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ignore some auxiliary files from knitr
| * | | | | | | Ignore auxiliary files from knitrAdam Liter2014-11-191-0/+5
| |/ / / / / /
* | | | | | | Merge pull request #1343 from jenrik/masterCarl Suster2015-01-071-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ignore npm-debug.log
| * | | | | | | Ignore npm-debug.logJenrik2015-01-021-0/+3
| | |_|_|/ / / | |/| | | | | | | | | | | | Debug log from npm is now ignored
* | | | | | | Merge pull request #1253Carl Suster2015-01-071-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some visual Studio 6 specific file types. See documentation at: http://msdn.microsoft.com/en-us/library/aa260829(v=vs.60).aspx http://msdn.microsoft.com/en-us/library/aa239568(v=vs.60).aspx Closes #1253 with amendments
| * | | | | | | Added links to msdn as per Carl Suster requestalexanderKhaustov2014-10-211-2/+2
| | | | | | | |
| * | | | | | | Some visual studio 6 specific file typesAlexander Khaustov2014-10-171-0/+5
| | | | | | | |
* | | | | | | | Merge pull request #1333 from adamrights/feature/redisCarl Suster2015-01-071-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add a global redis ignore file.
| * | | | | | | | Add a global redis ignore file.bedella2014-12-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignores all .rdb files, (default: dump.rdb). These files contain a binary representation of the in-memory redis data that is generated using cli tools or on a redis failure. They can be used to restore a redis db, and may contain sensitive data so should not be saved in version control.
* | | | | | | | | Merge pull request #1308 from ovanschie/patch-1Carl Suster2015-01-071-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update for Magento 1.9.1
| * | | | | | | | | Update for Magento 1.9.1Olav van Schie2014-12-051-0/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | Added Configurable Swatches and Pelago lib to ignore list
* | | | | | | | | Merge pull request #1305 from carlodri/patch-1Carl Suster2015-01-071-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Create IGORPro.gitignore
| * | | | | | | | | Create IGORPro.gitignoreCarlo Dri2014-12-031-0/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | .gitignore template file for repositories of Wavemetrics IGOR Pro functions (.ipf files).
* | | | | | | | | Merge pull request #1312 from rogersuen/global-jdevCarl Suster2015-01-071-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Global JDeveloper.gitignore
| * | | | | | | | | doc JDeveloper.gitignoreRoger Suen2014-12-101-0/+7
| | | | | | | | | |
| * | | | | | | | | added depoy/ and javadoc/ to JDeveloper.gitignoreRoger Suen2014-12-101-0/+2
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1163 from ma499/nodejs-visualstudioCarl Suster2015-01-071-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Ignore analysis files from Node.js tools for Visual Studio 2013
| * | | | | | | | | First addition for NTVS.Mustafa Arif2014-08-081-0/+3
| | | | | | | | | |