1
0
Commit Graph

714 Commits

Author SHA1 Message Date
Adam Roben
684a4fe44b Merge pull request from Utumno/patch-1
.classpath and .project files are *meant to be versioned*
2013-11-07 19:44:43 -08:00
Carl Suster
4e85d13e96 Merge pull request from seabre/patch-1
Ignore Leiningen REPL history
2013-11-07 18:54:47 -08:00
Sean Brewer
e4cc7a56ba Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore 2013-11-07 21:50:41 -05:00
Carl Suster
bd8dab3845 Merge pull request from cjerdonek/master
Make Python .gitignore directory entries match only directories
2013-11-07 18:31:11 -08:00
Chris Jerdonek
c038e773de Make Python .gitignore directory entries match only directories.
This commit also alphabetizes the distribution/packaging section after
separating the directory entries from the file entries.  I left alone
a few entries that I'm not sure about (i.e. *.egg and the
"Mr Developer" section).
2013-11-07 20:13:43 -06:00
Adam Roben
b65855ee93 Merge pull request from msgerbush/patch-1
Reverting change to ignore build subdirectories
2013-11-07 11:42:20 -08:00
Michael Gerbush
95075cccba Merge branch 'master' into patch-1
Conflicts:
	Objective-C.gitignore
2013-11-07 13:04:32 -06:00
Adam Roben
7bbc288b52 Merge pull request from karenetheridge/master
tighter and more perl entries
2013-11-07 10:39:29 -08:00
Adam Roben
f94c2a0b79 Merge pull request from abrodkin/qt-additions
Qt additions
2013-11-07 10:38:25 -08:00
Adam Roben
6309a0abea Merge pull request from zellux/master
Ignore Rails directories instead of their files
2013-11-07 10:34:58 -08:00
Adam Roben
d9b3471c1f Merge pull request from azzlack/master
Added template for EPiServer
2013-11-07 05:56:27 -08:00
Adam Roben
f4b8c4817b Merge pull request from SimonSimCity/master
Fix having TYPO3 core-files as symlinks and fixed product-name
2013-11-07 05:46:57 -08:00
Adam Roben
834dc0a183 Merge pull request from bripkens/patch-1
Ignore information for lein plugin directory.
2013-11-07 05:35:43 -08:00
Adam Roben
9338b030e7 Merge pull request from ghost/master
Magento 1.7 New Core Files & Folders Disregarded
2013-11-07 05:35:24 -08:00
Adam Roben
320a2c4ef4 Merge pull request from r1pp3rj4ck/patch-1
added composer.phar to Symfony2 gitignore
2013-11-07 05:30:39 -08:00
Adam Roben
eb49a83cba Merge pull request from jcowgill/master
Ignore generated MIDL header files
2013-11-07 05:14:59 -08:00
Carl Suster
f5a760d256 Merge pull request from nikr/patch-1
LaTeX.gitignore: add .brf for files generated by hyperref
2013-11-07 02:06:11 -08:00
Niklas Rehfeld
f0036b5a40 add .brf for files generated by hyperref
.brf files are generated if the 'backref' or 'pagebackref' options of the hyperref package are enabled. These are intermediate files, so shouldn't be tracked.
2013-11-07 22:54:37 +13:00
Carl Suster
48c388942c Merge pull request from oschrenk/patch-1
Ignore *.loa in LaTeX; auxiliary 'list of algorithms' file generated by the algorithms package
2013-11-06 19:58:09 -08:00
Carl Suster
1db3f61e98 Merge pull request from rayshan/patch-1
Comment for .py[cod] files
2013-11-06 19:46:18 -08:00
Carl Suster
b0e2d94e53 Merge pull request from lunks/remove-dot-project-from-rails-gitignore
Remove .project from Rails.gitignore since it is covered by Global/Eclipse.gitignore
2013-11-06 19:28:39 -08:00
Carl Suster
db625a1012 Merge pull request from stationkeeping/patch-1
Fixed SASS case (It's Sass, not SASS)
2013-11-06 15:30:32 -08:00
Adam Roben
49d7fbfc8c Merge pull request from healsdata/master
Create an ignore file for Vagrant's configuration and internal files.
2013-11-06 06:03:17 -08:00
Jonathan Campbell
c1af2ae829 Allow the Vagrantfile to be tracked as that's the intended purpose.
From the documentation at http://docs.vagrantup.com/v2/getting-started/project_setup.html

"The Vagrantfile is meant to be committed to version control with your project, if you use version control. This way, every person working with that project can benefit from Vagrant without any upfront work."
2013-11-05 22:41:37 -05:00
Carl Suster
8e101905d6 Merge pull request from huxuan/master
Add *.thm for LaTeX; generated by ntheorem/amsthm packages
2013-11-05 19:25:50 -08:00
Carl Suster
de4f9eff4f Merge pull request from ChristianBoehlke/master
Add *.lol to LaTeX.gitignore: generated by the listing package (list of listings)
2013-11-05 19:11:14 -08:00
Justin Spahr-Summers
7e4feaf658 Merge pull request from torbjoernk/global_add_kdevelop
adding global gitignore for KDevelop4
2013-11-05 11:23:52 -08:00
Coby Chapple
6188909b96 Merge pull request from cobyism/rework-contributing-guides
Better contributing guidelines
2013-11-05 09:06:05 -08:00
Coby Chapple
7375f82fac extract out new contributing guidelines to CONTRIBUTING.md 2013-11-05 17:05:25 +00:00
Adam Roben
798d9f15c2 Merge pull request from bakkdoor/master
Fancy gitignore
2013-11-05 09:04:33 -08:00
Adam Roben
1099dea39f Merge pull request from pangratz/add_texlipse
Add .texlipse for the TeXlipse Latex plugin for Eclipse
2013-11-05 09:03:04 -08:00
Adam Roben
47ebff05b6 Merge pull request from tomparle/patch-1
Added 'lib' and 'modules' folders which should also be excluded...
2013-11-05 08:49:25 -08:00
Adam Roben
7ff92c890a Merge pull request from harshadsabne/master
Add .gradle to Eclipse.gitignore
2013-11-05 08:39:37 -08:00
Adam Roben
5d2836f9b9 Merge pull request from tamird/patch-1
Update Scala.gitignore
2013-11-05 08:37:12 -08:00
Adam Roben
908bb556d1 Merge pull request from trevorsheridan/master
Cleaning up Objective-C .gitignore and adding OS X section
2013-11-05 08:36:38 -08:00
Adam Roben
b5f5b0f2ea Merge pull request from nichtich/patch-1
Added .bcf extension created by BibLaTeX
2013-11-05 08:29:17 -08:00
Adam Roben
fa55a30a46 Merge pull request from Skyr/master
SBT 0.12: Additional files
2013-11-05 06:49:38 -08:00
Stefan Schlott
02aa9eb7a8 Ignore cache and history (created by SBT >=0.12) 2013-11-05 07:36:32 +01:00
Coby Chapple
ad1a26d50d add a section about not including every template under the sun 2013-11-05 00:26:19 +00:00
Coby Chapple
ede3453e14 reword one-file-per-commit guideline to be about keeping PRs atomic 2013-11-05 00:01:34 +00:00
Markus Olsson
6665f37027 Merge pull request from bdukes/patch-2
Add $tf folder to VisualStudio.gitignore
2013-11-04 14:36:42 -08:00
Trevor Sheridan
ebe2e3e570 Cleaning up Objective-C .gitignore and adding OS X section 2013-11-04 15:33:14 -07:00
Brendan Forster
3d73f986a6 Merge pull request from juristr/patch-1
adds ignore for NCrunch cache folder
2013-11-04 14:09:04 -08:00
Markus Olsson
c31d59e948 Merge pull request from jamie-humphries/master
Add Visual Studio ignore rule for files generated by Microsoft Fakes.
2013-11-04 14:06:54 -08:00
Tamir Duberstein
2636793079 Update Scala.gitignore
sbt now creates .cache and .history
2013-11-04 11:36:31 -08:00
Coby Chapple
505a14fbf1 start reworking README to better articulate some contributing guidelines 2013-11-04 17:36:23 +00:00
Adam Roben
517a444703 Merge pull request from titanous/patch-1
Ignore Go test files
2013-11-04 07:18:46 -08:00
James Cowgill
3523237d7b Merge remote-tracking branch 'upstream/master'
Conflicts:
	CSharp.gitignore
	VB.Net.gitignore
2013-11-04 14:39:21 +00:00
Adam Roben
9f14e41dc6 Merge pull request from IconoclastLabs/master
Additions added
2013-11-04 06:37:03 -08:00
Jamie Humphries
364479bc2a Add Visual Studio ignore rule for files generated by Microsoft Fakes.
Ignores generated Fakes assemblies and related files placed under the FakesAssemblies directory.
These files are generated at build time from the *.fakes configuration files.
2013-11-04 14:36:51 +00:00