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

179 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
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
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
7ff92c890a Merge pull request #820 from harshadsabne/master
Add .gradle to Eclipse.gitignore
2013-11-05 08:39:37 -08:00
Stefan Schlott
02aa9eb7a8 Ignore cache and history (created by SBT >=0.12) 2013-11-05 07:36:32 +01: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
8480473de9 Merge pull request #804 from rutice/osx
Fix OSX-specific Icon\r rule
2013-11-04 05:44:51 -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
12b76696da Merge pull request #699 from Bengt/includism
Includism: Remove `.*`
2013-11-04 05:26:16 -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
7c5547dc20 Merge pull request #378 from agassi/patch-1
Add out folder to gitignore
2013-11-04 05:10:11 -08:00
Jonathan Campbell
5343cb30b2 Create an ignore file for Vagrant's configuration and internal files.
Documented at http://docs.vagrantup.com/v2/getting-started/project_setup.html

These files are created automatically the first time a vagrant box is started.
2013-11-03 00:43:07 -04:00
Harshad Sabne
5e2de71777 Add .gradle 2013-10-31 01:03:56 +05:30
mildis
59c668120f add Windows Installer files 2013-10-16 18:45:13 +02:00
mildis
d15f0b17fc add Windows Installer files 2013-10-16 18:39:24 +02:00
Daisuke Goto
da36175ff6 Fix OSX-specific Icon\r rule 2013-10-12 19:14:17 +09:00
Ivan Zuzak
f0dde55c6b ensure single trailing newline 2013-10-06 14:40:01 +02:00
Nysa
c98c138ee1 Vim: Forgot to change *.s[a-w][a-z] to .*.s[a-w][a-z] 2013-08-27 21:04:19 -05:00
Nysa
0030e9df60 Vim: Ignore .*.s[a-w][a-z] and .s[a-w][a-z] swap files
.*.s[a-w][a-z] matches named swap files.
.s[a-w][a-z] matches unnamed swap files.
2013-08-27 20:51:55 -05:00
Bengt Lüers
a6c76a5308 There is no need to unignore .gitignore.
Because files and directories starting with a `.` are not ignored in general.
2013-07-05 01:06:35 +02:00
Bengt Lüers
ad1289f0d9 Files and directories starting with a . should not be ignored in general. 2013-07-05 01:06:35 +02:00
stationkeeping
923acecd29 Fixed SASS case (It's Sass, not SASS) 2013-05-09 09:50:44 +02:00
Nysa
acce99efee Ignore Vim untitled and unsaved buffer swapfiles
Vim creates buffer swapfiles starting at .swp for buffers that are
active but untitled and unsaved.
2013-03-06 11:02:36 -06:00
Justin Spahr-Summers
eaa2ad526f Merge pull request #474 from zhaojunmeng/master
Add *~ to ignore vim temp file.
2013-01-22 13:39:30 -08:00
Matt Burke
0e38a13ffb Merge pull request #514 from bristol/vim-swapfile-fix
Changed line matching vim swapfiles to use all names it will create
2013-01-22 12:08:37 -08:00
andy bristol
c6bcfb1bd4 Changed line matching vim swapfiles to use all names it will create as described in http://vimdoc.sourceforge.net/htmldoc/recover.html#E326 2013-01-21 20:10:16 -05:00
Haacked
ec5009e954 Move VisualStudio file from Global to main list 2012-12-19 15:28:41 -08:00
amalrik
044043f559 change the line endings of Global/OSX from dos to unix format 2012-11-22 21:33:12 -02:00
zhaojunmeng
3c54c0d7aa Add *~ to ignore vim temp file. 2012-11-14 22:26:04 +08:00
Jared Koumentis
8200f76973 Merge pull request #341 from x3ro/fix-sublime
The sublime-project file should be checked into version control
2012-10-05 15:15:59 -07:00
Jean-Bernard Ratté
187c9cd399 VritualEnv specific files generated automaticaly when a new Env is created 2012-09-30 11:51:29 -04:00
Jean-Bernard Ratté
e295e20fa2 PyCharm IDE project specific files 2012-09-30 11:47:35 -04:00
Justin Spahr-Summers
c61686f988 Merge remote-tracking branch 'exalted/master' 2012-08-27 09:21:32 -07:00
Ali Servet Donmez
964de38e9b Merge branch 'master' of https://github.com/github/gitignore
Conflicts:
	Global/OSX.gitignore
2012-08-27 12:40:37 +02:00
Ali Servet Donmez
54928f53d7 Seems like this should go into OSX.gitignore instead. 2012-08-27 12:38:11 +02:00
Coby Chapple
f78c09ffd2 Manual merge to close #305 2012-08-24 16:43:07 +10:00
Coby Chapple
4f958411c1 Merge pull request #303 from safwanc/matlab-mex
Ignoring compiled MEX binaries for all platforms
2012-08-23 23:39:41 -07:00
Jonas Trevisan
174c45e796 Added .AppleDouble to OSX 2012-08-22 13:38:50 -03:00
Justin Spahr-Summers
e732aa40a1 Merge pull request #348 from bjoern-esser/master
ignore bz2 files, which are bzip2 actually
2012-08-09 00:10:14 -07:00
Justin Spahr-Summers
fa954f291e Merge pull request #334 from mkenyon/master
Add OSX-specific Icon\r rule
2012-08-09 00:09:51 -07:00
Coby Chapple
b2818653f6 Merge pull request #360 from svanschu/master
PHPStorm gitignore
2012-08-08 18:26:38 -07:00
Coby Chapple
5a860949c0 Remove space after Thumbs.db — fixes #355 2012-08-08 17:37:15 +10:00
Coby Chapple
52398081c6 Merge pull request #395 from hugocf/patch-1
Windows XP Media Center Edition also creates ehthumbs.db
2012-08-02 19:51:19 -07:00
Coby Chapple
55f8c12acc Merge pull request #385 from gneatgeek/master
Updated SASS gitignore
2012-08-02 19:29:02 -07:00
Justin Spahr-Summers
f88aa40dbe Merge pull request #361 from MaxNanasy/patch-1
Removed redundant ".directory" that was already covered by ".*".
2012-08-02 19:05:26 -07:00
Justin Spahr-Summers
e31878f8bc Merge pull request #304 from mgold/master
.netrwhist
2012-08-02 19:03:41 -07:00
Hugo Ferreira
0be0dd05f7 Windows XP Media Center Edition also creates ehthumbs.db which holds previews of video files.
See http://en.wikipedia.org/wiki/Windows_thumbnail_cache#Thumbs.db
2012-07-17 01:17:08 +02:00