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

2343 Commits

Author SHA1 Message Date
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
andres-mancera
e3f9a54515 Moving SynopsysVCS.gitignore into Global/.
Whether to use VCS or any other simulator is a choice of the individual designer rather than of the project as a whole.
2015-01-21 20:45:09 -08: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
Rafael Corrêa Gomes
cd72caa6a5 Only .htaccess.sample 2015-01-21 23:37:22 -02: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
Rafael Corrêa Gomes
525a16313e Setup of the development environment.
The .htaccess settings depend on the development environment, in some cases it is not used.
2015-01-21 19:45:11 -02:00
Rafael Corrêa Gomes
e6d0be8f10 Base path to placeholder images
Base is media/catalog/product/placeholder/default/ and media/catalog/product/placeholder/my-theme/ new placeholder set on admin.
2015-01-21 19:26:49 -02:00
andres-mancera
0854e48806 Removing the last two lines since they are editor-specific (Namely, VI and Emacs).
As Carl has pointed out, they are covered by other templates under Global/.
2015-01-21 10:00:29 -08:00
Richard Astbury
aa853a08e9 added the orleans.codegen.cs file automatically generated by Orleans 2015-01-21 11:02:28 +00:00
Carl Suster
2609c4c728 Merge pull request #1373 from wafiq/patch-1
Typo in comment
2015-01-21 19:48:19 +11:00
Wafiq Rodzuan
33546effa9 Typo in comment
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.
2015-01-21 16:30:32 +08:00
Sam Whited
297b78cea6 Update Android.gitignore
Gitignore the temp files directory generated by Android Studio's navigation editor tool.
2015-01-17 12:47:39 -05: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
Geoff Schoeman
0ed7e94854 Added template for Google App Engine 2015-01-15 19:05:19 -05:00
Nate West
36ebe1a596 Add Carthage build folder and explaination 2015-01-15 11:28:08 -05: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
Steve Lacy
586674cfb4 add .Trash-* to ignore Linux partition or ext disk trash folders 2015-01-13 15:31:58 -07:00
Rob
9fd651e00f Update TeX.gitignore
*.synctex is generated when the synctex option is used under Windows.
2015-01-13 09:40:43 +01:00
Michael Baltaks
37f888d5cd Ignore the pip self check marker file in a Virtualenv. 2015-01-10 17:49:44 +11:00
Sebastian Godelet
d0748cf9a4 Mercury.gitignore: Add Mercury.modules
The Mercury.modules file can be auto-generated by the Mercury compiler,
as such it appears only in Makefiles, and should therefore be ignored.
2015-01-09 13:06:58 +08: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
tralchonok
45bf307ca7 moved 2015-01-07 19:40:23 +05:30
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