Commit Graph
100 Commits
Author SHA1 Message Date
Carl Suster 62d6528cb1 Merge pull request #1446 from igarcez/master
Stop ignoring app/code/local/Mage
2015-04-01 10:27:29 +11:00
Carl Suster 498f06dae9 Merge pull request #1442 from DanNixon/add-kicad
Create KiCAD.gitignore
2015-04-01 10:26:04 +11:00
Carl Suster 5883804e6c Merge pull request #1459 from shalecraig/patch-1
Link to section being described
2015-03-31 12:55:50 +11:00
Carl Suster 18e0801ff3 Merge pull request #1460 from jcgay/takari-smart-builder
Ignore timing.properties from takari-smart-builder
2015-03-31 12:54:52 +11:00
Carl Suster 2d48f944e3 Merge pull request #1453 from pegurnee/cakephp_headers
comment out CakePHP version headers
2015-03-31 12:35:18 +11:00
Carl Suster b8da0e3a89 Merge pull request #1430 from Lucretiel/patch-1
Added coverage annotation files
2015-03-17 11:17:29 +11:00
Carl Suster 2f4cb0220d Merge pull request #1433 from riosc/patch-1
removing aditional white space
2015-03-15 12:47:12 +11:00
Carl Suster c7bca99f57 Merge pull request #1435 from Dashed/patch-1
Add dSYM folder to C.gitignore for OSX env
2015-03-15 12:46:27 +11:00
Carl Suster 1574483716 Merge pull request #1428 from bondolo/patch-1
Add buildNumber.properties
2015-03-15 12:45:34 +11:00
Carl Suster 03372a587d Merge pull request #1429 from ergl/master
Update Jetbrains.gitignore
2015-03-15 12:45:23 +11:00
Carl Suster 5c5d4dfff9 Merge pull request #1436 from tac0x2a/ignore-cache-dir
Add ".ensime_cache" to "Ensime.gitignore"
2015-03-15 12:43:57 +11:00
Carl Suster a4bc938b3a Merge pull request #1432 from jakejohns/hotfix/laravel5-env
Add ".env" to Laravel.gitignore
2015-03-15 12:42:28 +11:00
Carl Suster a818c8ba7e Merge pull request #1438 from myurtoglu/master
Add CUDA.gitignore
2015-03-15 12:40:45 +11:00
Carl Suster 4a9d41f894 Merge pull request #1352 from sebgod/mercury-add-modules
Mercury.gitignore: Add Mercury.modules
2015-03-01 13:11:18 +11:00
Carl Suster 5a46616766 Merge pull request #1411 from ptigwe/master
Ignore auxiliary files for gnuplottex
2015-03-01 13:05:34 +11:00
Carl Suster 2b1fe3e280 Merge pull request #1410 from adamasantares/master
Update Joomla.gitignore
2015-03-01 13:02:49 +11:00
Carl Suster eaeed89430 Merge pull request #1407 from relekang/python-cumulative-coverage
Add .coverage. to Python.gitignore
2015-03-01 12:44:09 +11:00
Carl Suster 4dafb36bab Merge pull request #1405 from occidens/OSX
Expand list of root-of-volume dotfiles
2015-03-01 12:42:58 +11:00
Carl Suster 8142e0af5a Merge pull request #1412 from dareonion/master
add dependency-reduced-pom.xml, which is a maven shader thing
2015-03-01 12:39:00 +11:00
Carl Suster d5813d679e Merge pull request #1418 from cdepillabout/haskell-remove-cabal.config
Remove cabal.config from Haskell gitignore
2015-03-01 12:35:22 +11:00
Carl Suster 6cd95612a2 Merge pull request #1423 from Gurmeet-Singh/Updating-TEX.gitignore
Added backup files for WinEdt
2015-03-01 12:31:09 +11:00
Carl Suster c1cd9540de Merge pull request #1397 from maieul/master
minted 2.0 makes new files
2015-02-08 13:59:57 +11:00
Carl Suster 3ebb3221cc Merge pull request #1389 from joomalungma/patch-1
joomla 3.3.6
2015-02-06 14:36:58 +11:00
Carl Suster 0a8b50b687 Merge pull request #1391 from skuschel/master
add .eggs/ directory to Python.gitignore
2015-02-06 14:33:48 +11:00
Carl Suster 0a8b6b9b2b Merge pull request #1396 from polamjag/ignore-vendor-bundle-on-ruby
ignore /vendor/bundle on Ruby.gitignore
2015-02-06 14:28:20 +11:00
Carl Suster 5d8b19ad57 Merge pull request #1398 from pamrichmond/patch-1
Correct URL for NPM URL reference
2015-02-06 14:25:07 +11:00
Carl Suster 98a0d1176b Merge pull request #1390 from karenetheridge/topic/perl_20150201
ignore new scratch directory for metadata
2015-02-05 14:54:45 +11:00
Carl Suster 2500b4c80a Merge pull request #1382 from github/revert-1343-master
Revert "Ignore npm-debug.log"
2015-01-24 15:44:28 +11:00
Carl Suster cbe3b7bf37 Revert "Ignore npm-debug.log" 2015-01-24 15:43:52 +11:00
Carl Suster 70d01c389d Merge pull request #1282 from andres-mancera/synopsys_vcs
Adding gitignore file for Synopsys VCS simulator.
2015-01-22 17:25:09 +11:00
Carl Suster 3aab1a12c3 Merge pull request #1319 from mviranyi/master
Unity3D - Cache files, solution settings files and meta file update
2015-01-22 14:27:34 +11:00
Carl Suster 3e5b733ad3 Merge pull request #1262 from janno-p/master
User-specific files for MonoDevelop/Xamarin Studio.
2015-01-22 14:24:34 +11:00
Carl Suster 77e1463e48 Merge pull request #1378 from rafaelstz/patch-4
Setup of the development environment.
2015-01-22 14:15:49 +11:00
Carl Suster 0232b30749 Merge pull request #1365 from geoffschoeman/master
Add Google App Engine generated folder
2015-01-22 11:36:49 +11:00
Carl Suster 2f75d9020e Merge pull request #1376 from rafaelstz/patch-2
Base path to placeholder images
2015-01-22 11:22:49 +11:00
Carl Suster 2609c4c728 Merge pull request #1373 from wafiq/patch-1
Typo in comment
2015-01-21 19:48:19 +11:00
Carl Suster 608690d6b9 Merge pull request #1364 from nwest/swift-carthage
Add Carthage build folder and explaination
2015-01-16 15:47:52 +11:00
Carl Suster 8bc0e535bb Merge Pull Request #1338 for Eclipse
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.
2015-01-15 11:41:35 +11:00
Carl Suster 1fea76a08e Merge pull request #1285 from paolofulgoni/gradle-wrapper
Avoid ignoring Gradle wrapper jar file
2015-01-15 11:29:23 +11:00
Carl Suster ce6ed14496 Merge pull request #1306 from Hillkorn/patch-1
Added missing gradle netbeans directory
2015-01-14 12:17:31 +11:00
Carl Suster ecaf2de8fa Merge pull request #1353 from mbaltaks/patch-1
Ignore the pip self check marker file in a Virtualenv.
2015-01-14 12:11:40 +11:00
Carl Suster fdc78cd32d Merge pull request #1362 from stevelacy/master
Add .Trash-* to ignore Linux partition or ext disk trash folders
2015-01-14 11:55:05 +11:00
Carl Suster edde2fcd95 Merge pull request #1359 from masgo/master
Update TeX.gitignore
2015-01-14 11:51:49 +11:00
Carl Suster 6f8aee0564 Merge pull request #1311 from rafaelstz/patch-1
root sitemap.xml
2015-01-08 12:55:10 +11:00
Carl Suster f6c017edc2 Merge pull request #1344 from tral/master
Built application files (for Android Studio projects)
2015-01-08 12:49:27 +11:00
Carl Suster 5130d9a506 Merge pull request #1349 from MOROZILnic/patch-1
Update VisualStudio.gitignore
2015-01-08 12:48:38 +11:00
Carl Suster 19e774822b Merge pull request #1257 from sidewinder94/patch-1
Ignoring Pow environment settings (Rails)
2015-01-07 16:58:02 +11:00
Carl Suster a69c4aafb7 Merge pull request #1303 from vladon/master
Added Castalia *.stat files
2015-01-07 16:54:53 +11:00
Carl Suster 3c36466ce4 Merge pull request #1288 from cake17/add-cakephp3
add rules for new CakePHP 3
2015-01-07 16:42:23 +11:00
Carl Suster 2a77fa433f Merge pull request #1286 from adamliter/master
Ignore some auxiliary files from knitr
2015-01-07 16:41:23 +11:00
Carl Suster 758848d4ae Merge pull request #1343 from jenrik/master
Ignore npm-debug.log
2015-01-07 16:35:36 +11:00
Carl Suster 1b2072a8cd Merge pull request #1253
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
2015-01-07 16:31:03 +11:00
Carl Suster f84293b9ce Merge pull request #1333 from adamrights/feature/redis
Add a global redis ignore file.
2015-01-07 16:18:53 +11:00
Carl Suster 7c24eebba9 Merge pull request #1308 from ovanschie/patch-1
Update for Magento 1.9.1
2015-01-07 16:17:11 +11:00
Carl Suster 29c7bc87c5 Merge pull request #1305 from carlodri/patch-1
Create IGORPro.gitignore
2015-01-07 16:09:54 +11:00
Carl Suster 72d6f2cf84 Merge pull request #1312 from rogersuen/global-jdev
Global JDeveloper.gitignore
2015-01-07 16:08:04 +11:00
Carl Suster 95a6bdab6a Merge pull request #1163 from ma499/nodejs-visualstudio
Ignore analysis files from Node.js tools for Visual Studio 2013
2015-01-07 15:34:23 +11:00
Carl Suster f9a4711e47 Merge pull request #1226 from dmbaturin/master
Add ocamlbuild and oasis generated files to OCaml .gitignore
2015-01-07 15:25:21 +11:00
Carl Suster 4d3f69ab13 Merge pull request #1342 from adelq/master
Create Nim.gitignore
2015-01-07 15:24:24 +11:00
Carl Suster e1d64cec0e Merge pull request #1346 from ldrumm/master
Added a .gitignore template for Lua based projects.
2015-01-07 15:21:13 +11:00
Carl Suster 9f1b7d77e2 Capitalise initial letter in template filenames for consistency/sorting 2015-01-07 15:16:27 +11:00
Carl Suster 6500aa8dc1 Merge pull request #1350 from julianpistorius/patch-1
Should "boostrap.json" be "bootstrap.json"?
2015-01-07 15:11:27 +11:00
Carl Suster 13f15a38f3 Merge pull request #1325 from aurmil/magento-modman
Ignore Magento .modman directory
2014-12-23 21:01:34 +11:00
Carl Suster 3ed4405a34 Merge pull request #1218 from bbodenmiller/patch-3
update comment on ignoring repositories.config
2014-12-23 11:56:45 +11:00
Carl Suster 69eccb80fd Merge pull request #1323 from aurmil/magento-root-files
Fix Magento PHP root files names patterns
2014-12-23 11:36:07 +11:00
Carl Suster d299d9751a Merge pull request #1327 from lighght/patch-1
add ignore achemso bib file (acs-*.bib) to TeX.gitignore
2014-12-21 15:08:13 +11:00
Carl Suster d7161533f1 Merge pull request #1317 from arkeidolon/patch-1
Add space at Unity gitignore comment
2014-12-12 16:03:20 +11:00
Carl Suster 72d8ae3d10 Merge pull request #1307 from Frozenfire92/patch-1
Unity: Fix solution/project files for nested directories.
2014-12-12 01:54:23 +11:00
Carl Suster c6e6d99b65 Merge pull request #1290 from djboni/master
Add LibreOffice.gitignore
2014-12-01 14:05:59 +11:00
Carl Suster 32c88e2a46 Merge pull request #1284 from jakepetroules/patch-1
Ignore Qt Creator cache files for Qbs projects.
2014-11-29 16:51:59 +11:00
Carl Suster b584eee4d6 Merge pull request #1263 from jangorecki/master
R.gitignore - exclude vignettes products
2014-11-29 15:38:28 +11:00
Carl Suster 39365da385 Merge pull request #1280 from renhx/rails-sqlite3-journal
Added *.sqlite3-journal to Rails.gitignore
2014-11-29 15:36:40 +11:00
Carl Suster e69894bc7b Merge pull request #1293 from marcelkorpel/master
Add .SRCINFO
2014-11-29 15:26:19 +11:00
Carl Suster b66756fbc9 Merge pull request #1298 from adamliter/r
Add history file that is generated by R.app for Mac OS
2014-11-29 15:19:44 +11:00
Carl Suster 1a6b68c006 Merge pull request #1197 from TonyArra/extjs
Add gitignore for Sencha/Extjs
2014-11-13 14:12:32 +11:00
Carl Suster 137ea2e8ac Merge pull request #1233 from stuartpb/patch-1
Restore original comment about node_modules
2014-11-12 18:54:40 +11:00
Carl Suster 986530f3e0 Merge pull request #1261 from jaxx/master
Ignore debug information files
2014-11-12 18:43:22 +11:00
Carl Suster 38a7a5d98d Merge pull request #1271 from bitemyapp/patch-1
Added Haskell GHC profiling related files
2014-11-12 18:41:20 +11:00
Carl Suster 530bca8290 Merge pull request #1267 from rogersuen/global-jdev
added JDeveloper.gitignore
2014-11-12 18:30:24 +11:00
Carl Suster cb72558166 Merge pull request #1272 from jakubtuchol/dynhaskell
adding dynamically linked haskell libraries
2014-11-12 18:28:06 +11:00
Carl Suster 16053ba600 Merge pull request #1264 from arteymix/master
Added a gitignore for Anjuta IDE http://anjuta.org/
2014-11-08 12:36:47 +11:00
Carl Suster 6d91b087d2 Merge pull request #1225 from thurask/momentics
Add user-specific settings to Momentics.gitignore
2014-11-06 14:18:50 +11:00
Carl Suster 6978506972 Merge pull request #1266 from parched/master
ArchLinuxPackages: Ignore AUR metadata (.AURINFO)
2014-11-06 14:15:29 +11:00
Carl Suster 85428a7fe6 Merge pull request #1259 from Kaceykaso/patch-1
Create CodeKit.gitignore
2014-11-06 14:09:29 +11:00
Carl Suster c9ad00b97f Merge pull request #1273 from bbodenmiller/patch-4
Create MicrosoftOffice
2014-11-06 14:04:22 +11:00
Carl Suster 408c616ae0 Merge pull request #1232 from thunsaker/patch-1
Added New Files created by Crashlytics Plugin
2014-10-20 17:47:22 +11:00
Carl Suster 4da8043524 Merge pull request #1251 from tomsquest/master
Ignore iml file anywhere
2014-10-20 12:55:21 +11:00
Carl Suster 6100f5ea04 Merge pull request #1215 from devoncarew/patch-3
Update Dart.gitignore
2014-10-20 12:51:28 +11:00
Carl Suster ec7fec00be Merge pull request #1223 from mlacorte/patch-1
Ignore HPC files generated by GHC
2014-10-20 12:45:24 +11:00
Carl Suster 0f33f34295 Merge pull request #1234 from stuartpb/patch-2
Explain .lock-wscript and move it
2014-10-20 12:41:16 +11:00
Carl Suster d13e68a669 Merge pull request #1248 from iori-o/emacs_cask
Adding .cask directory to Global/Emacs.gitignore
2014-10-20 12:35:23 +11:00
Carl Suster 99bae0fd6b Merge pull request #1250 from TreeRex/ignore-nrepl
Added Cider's .nrepl-port file.
2014-10-20 12:34:44 +11:00
Carl Suster 09125b338a Merge pull request #1252 from paolofulgoni/tortoisegit
Create TortoiseGit.gitignore
2014-10-20 12:32:28 +11:00
Carl Suster db181ccff2 Merge pull request #1249 from leandrodeleite/master
Scala/Eclipse .gitignore updates
2014-10-20 12:26:32 +11:00
Carl Suster d9cc01e935 Merge pull request #1245 from daroczig/master
revert 1f84661643
2014-10-13 09:36:09 +11:00
Carl Suster 298588469a Merge pull request #1231 from oohnajra/patch-1
Update Umbraco.gitignore
2014-09-30 10:29:01 +10:00
Carl Suster 7acb3d6cdc Merge pull request #1213 from mturnwall/master
Add sourcemaps to the Sass ignore
2014-09-18 12:30:50 +10:00
Carl Suster 6ea8f9abeb Merge pull request #1212 from Fuhrmann/patch-1
Typo in Jetbrains gitignore
2014-09-18 12:30:28 +10:00
Carl Suster 4ddafa3728 Merge pull request #1189 from github/remove-tasm
[Tasm] Remove template
2014-09-15 12:19:28 +10:00
Carl Suster 5aa7e578c9 Merge pull request #1190 from github/remove-target3001
[Target3001] Remove template
2014-09-15 12:14:06 +10:00