1
0
mirror of https://github.com/github/gitignore synced 2024-11-01 09:38:44 +01:00
Commit Graph

1154 Commits

Author SHA1 Message Date
Carl Suster
db625a1012 Merge pull request #643 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 #821 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 #398 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 #438 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 #315 from torbjoernk/global_add_kdevelop
adding global gitignore for KDevelop4
2013-11-05 11:23:52 -08:00
Coby Chapple
6188909b96 Merge pull request #826 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 #302 from bakkdoor/master
Fancy gitignore
2013-11-05 09:04:33 -08:00
Adam Roben
1099dea39f Merge pull request #300 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 #232 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 #820 from harshadsabne/master
Add .gradle to Eclipse.gitignore
2013-11-05 08:39:37 -08:00
Adam Roben
5d2836f9b9 Merge pull request #825 from tamird/patch-1
Update Scala.gitignore
2013-11-05 08:37:12 -08:00
Adam Roben
908bb556d1 Merge pull request #827 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 #693 from nichtich/patch-1
Added .bcf extension created by BibLaTeX
2013-11-05 08:29:17 -08:00
Adam Roben
fa55a30a46 Merge pull request #434 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 #526 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 #780 from juristr/patch-1
adds ignore for NCrunch cache folder
2013-11-04 14:09:04 -08:00
Markus Olsson
c31d59e948 Merge pull request #824 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 #713 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 #822 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
Adam Roben
9fd7b32f58 Merge pull request #765 from martinblech/patch-1
Ignoring [._]*.s[a-w][a-z] instead of *.s[a-w][a-z]
2013-11-04 06:36:31 -08:00
Martín Blech
464ae2642b Ignoring [._]*.sw[a-p] instead of *.s[a-w][a-z]
The old pattern was too broad and was making VIM ignore Scheme (*.scm) files.
Now it only matches files that start with . or _.
2013-11-04 11:31:51 -03:00
Adam Roben
8e05c73621 Merge pull request #823 from snisarg/master
Added Windows specific .obj for objects to ignore.
2013-11-04 06:04:48 -08:00
Gant Laborde
530eda1c24 Merge pull request #1 from ipwnstuff/master
Add a few files and directories to RubyMotion.gitignore
2013-11-04 05:56:22 -08:00
Adam Roben
0abc522d3c Merge pull request #819 from normenmueller/master
extend list of LaTeX/ Scala ignores
2013-11-04 05:52:01 -08:00
Nisarg Shah
830889620e Added Windows specific .obj for objects to ignore. 2013-11-04 19:21:39 +05:30
Adam Roben
fa5269853c Merge pull request #640 from arcresu/patch-1
Ignore additional temporary files in LaTeX projects
2013-11-04 05:50:54 -08:00
Adam Roben
8480473de9 Merge pull request #804 from rutice/osx
Fix OSX-specific Icon\r rule
2013-11-04 05:44:51 -08:00
Adam Roben
7a40a39053 Merge pull request #786 from micole/processingproject
Added the processing project
2013-11-04 05:40:29 -08:00
Adam Roben
43f3bb3952 Merge pull request #751 from nysa/master
Vim: Ignore .*.s[a-w][a-z] and .s[a-w][a-z] swap files
2013-11-04 05:38:40 -08:00
Adam Roben
50ee7b7156 Merge pull request #810 from mildis/master
add Windows Installer files
2013-11-04 05:33:24 -08:00
Adam Roben
ca5c02406c Merge pull request #703 from modocache/master
Ignore source control plist files generated by Xcode.
2013-11-04 05:28:59 -08:00
Adam Roben
12b76696da Merge pull request #699 from Bengt/includism
Includism: Remove `.*`
2013-11-04 05:26:16 -08:00
Adam Roben
60575531d2 Merge pull request #613 from bdukes/patch-3
Ignore user-specific ReSharper settings
2013-11-04 05:21:57 -08:00
Adam Roben
0e5ad28f71 Merge pull request #405 from malleor/master
Added Windows objects, libraries and executables to C++.gitignore
2013-11-04 05:17:28 -08:00
Adam Roben
8b68687361 Merge pull request #370 from bdsatish/master
gtags (GNU global) and cscope ignore files.
2013-11-04 05:16:16 -08:00
Adam Roben
bb60b96742 Merge pull request #377 from IconoclastLabs/master
Add RubyMotion gitignore to Github's defaults
2013-11-04 05:12:52 -08:00
Adam Roben
7c5547dc20 Merge pull request #378 from agassi/patch-1
Add out folder to gitignore
2013-11-04 05:10:11 -08:00
Markus Olsson
b12c6cd59c Merge pull request #674 from sayedihashimi/master
Update to remove .pubxml
2013-11-04 04:14:50 -08:00
Markus Olsson
a7148bf53b Merge pull request #567 from kshapkin/master
VisualStudio: Add Business Intelligence projects
2013-11-04 01:34:20 -08:00
Markus Olsson
f63a5cd6c8 Merge pull request #709 from jonathanwindle/visualstudio-schemaview
Add schemaview extension to VisualStudio.gitignore
2013-11-04 01:25:30 -08:00