Commit Graph

497 Commits

Author SHA1 Message Date
Greg Whitworth
1fbbb01eb3 Added config files that should not be placed into repos by default as they contain database information and URL's that will vary between local and other servers and can cause conflicts. 2012-12-13 10:07:44 -09:00
Coby Chapple
747efedec0 Merge pull request #450 from rbxbx/patch-1
Update Leiningen.gitignore
2012-10-12 00:08:07 -07:00
Robert Pitts
cdb12b3754 Update Leiningen.gitignore
/targets/ should be ignored as well
2012-10-11 16:59:14 -07: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
Jared Koumentis
2b46b24413 Merge pull request #382 from x3ro/latex-addition
Ignore *.tdo files generated by the todonotes package
2012-10-05 15:14:44 -07:00
Jared Koumentis
802cb3f13c Merge pull request #380 from borekb/patch-1
Flex / ActionScript project files removed from .gitignore
2012-10-05 15:13:44 -07:00
Jared Koumentis
d17f128585 Merge pull request #440 from nap/master
PyCharm IDE project specific files
2012-10-04 17:53:55 -07:00
Jared Koumentis
aa8fd18ed3 Merge pull request #215 from nkh/patch-1
Do not ignore directory matching /Build/
2012-10-04 17:50:59 -07:00
Jared Koumentis
e605ce745a Merge pull request #212 from ikeike443/patch-1
Delete duplicated "eclipse" and support ignoring IDEA's metafile such as
2012-10-04 17:44:49 -07:00
Jared Koumentis
e571ee1e42 Merge pull request #349 from tucnak/master
Gitignore for Qt core developers
2012-10-04 17:41:13 -07:00
Jared Koumentis
e0fbe0f0b3 Merge pull request #354 from misham/sdcc
Adding support for SDCC compiler files
2012-10-04 17:38:36 -07:00
Jared Koumentis
62ca2a71d7 Merge pull request #321 from torifat/patch-1
duplicate entry for modules removed
2012-10-04 17:36:47 -07:00
Jared Koumentis (ShepBook)
2671086d63 attempting to merge https://github.com/github/gitignore/pull/310 2012-10-04 20:30:20 -04:00
Jared Koumentis
a235be60b2 Merge pull request #314 from squallstar/master
Bancha CMS .gitignore
2012-10-04 17:20:07 -07:00
Jared Koumentis
3dbe9c96d1 Merge pull request #441 from StanislawSwierc/master
Added Windows Store app package directory
2012-10-04 17:16:25 -07:00
Stanislaw Swierc
0bcb4f258c Added Windows Store app package directory 2012-10-01 10:05:17 +01: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
Ted Nyman
c1cac76c73 Update README to detail best pull request style 2012-09-23 14:31:30 -07:00
Ted Nyman
64cc236103 Merge pull request #425 from nateabele/patch-1
The Lithium app should be the root repo folder
2012-09-10 15:00:48 -07:00
Ted Nyman
9a95caff33 Merge pull request #363 from Baztoune/master
Added Play 2.0 working directories
2012-09-10 14:55:29 -07:00
Nate Abele
a5d6516f13 The Lithium app should be the root repo folder 2012-09-01 19:10:36 -03: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
Justin Spahr-Summers
f1cb24b9c2 Merge remote-tracking branch 'stig/patch-1'
Conflicts:
	Objective-C.gitignore
2012-08-27 03:29:25 -07: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
Coby Chapple
75da0e1af2 Merge pull request #419 from jonhkr/patch-1
Added .AppleDouble to OSX
2012-08-23 23:38:56 -07:00
Coby Chapple
25a1e617c4 Merge pull request #420 from vanniksoftware/master
Appcelerator Titanium .gitignore file
2012-08-23 23:36:53 -07:00
Mike Nikles
a1ef23350d Added Appcelerator Titanium .gitignore file. 2012-08-22 18:06:15 -07:00
Jonas Trevisan
174c45e796 Added .AppleDouble to OSX 2012-08-22 13:38:50 -03:00
Ali Servet Donmez
d08fbbd0d4 Merge branch 'master' of https://github.com/github/gitignore 2012-08-22 12:22:38 +02:00
Coby Chapple
c160ad912a Merge pull request #415 from honzajavorek/patch-1
Added missing whitespaces in comments
2012-08-19 17:13:52 -07:00
Honza Javorek
2f7bc6bab3 added missing whitespaces in comments 2012-08-18 19:55:23 +03:00
Coby Chapple
76dd79a51f Merge pull request #406 from ecarreras/master
Adding PyDev files to .gitignore
2012-08-09 20:45:01 -07:00
Coby Chapple
d14aab9a64 Merge pull request #407 from AArnott/patch-1
Adds .vspx and .log files to exclude for C#/VB
2012-08-09 20:43:59 -07: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
Justin Spahr-Summers
f453a04cb4 Merge pull request #294 from yrashk/patch-1
Don't ignore priv directory in Erlang projects
2012-08-09 00:03:25 -07:00
Coby Chapple
b2818653f6 Merge pull request #360 from svanschu/master
PHPStorm gitignore
2012-08-08 18:26:38 -07:00
Andrew Arnott
de7a7117c7 Added .vspx and .log to .gitignore for VB 2012-08-08 16:36:34 -07:00
Andrew Arnott
6073319fb1 Added .gitignore entries for .vspx and .log 2012-08-08 16:33:51 -07:00
Eduard Carreras
2661a82010 Adding pydev files 2012-08-08 19:57:13 +03:00
Coby Chapple
5a860949c0 Remove space after Thumbs.db — fixes #355 2012-08-08 17:37:15 +10:00
Ali Servet Donmez
6f6c2eac58 Add .LSOverride 2012-08-03 12:41:27 +02:00
Coby Chapple
fcb11295b5 Merge pull request #392 from lmjabreu/patch-2
Added file exclusions, reformatted
2012-08-02 20:02:12 -07: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
54769b4048 Merge pull request #400 from NameFILIP/patch-1
Update SeamGen.gitignore
2012-08-02 19:49:00 -07:00
Coby Chapple
bc0c761efc Merge pull request #399 from bfuk/patch-2
Added ignore of W3TC cache folder (for users that might be using W3TC ca...
2012-08-02 19:48:21 -07:00