Commits · 964de38e9b75e3c716496180001e1765ca3ecd9d · general / gitignore

27 Aug, 2012 3 commits
- Merge branch 'master' of https://github.com/github/gitignore · 964de38e
  Ali Servet Donmez authored Aug 27, 2012
```
Conflicts:
	Global/OSX.gitignore
```
  964de38e
- Seems like this should go into OSX.gitignore instead. · 54928f53
  Ali Servet Donmez authored Aug 27, 2012
  
  54928f53
- Merge remote-tracking branch 'stig/patch-1' · f1cb24b9
  Justin Spahr-Summers authored Aug 27, 2012
```
Conflicts:
	Objective-C.gitignore
```
  f1cb24b9
24 Aug, 2012 4 commits
- Manual merge to close #305 · f78c09ff
  Coby Chapple authored Aug 24, 2012
  
  f78c09ff
- Merge pull request #303 from safwanc/matlab-mex · 4f958411
  Coby Chapple authored Aug 24, 2012
```
Ignoring compiled MEX binaries for all platforms
```
  4f958411
- Merge pull request #419 from jonhkr/patch-1 · 75da0e1a
  Coby Chapple authored Aug 24, 2012
```
Added .AppleDouble to OSX
```
  75da0e1a
- Merge pull request #420 from vanniksoftware/master · 25a1e617
  Coby Chapple authored Aug 24, 2012
```
Appcelerator Titanium .gitignore file
```
  25a1e617
23 Aug, 2012 1 commit
- Added Appcelerator Titanium .gitignore file. · a1ef2335
  Mike Nikles authored Aug 23, 2012
  
  a1ef2335
22 Aug, 2012 2 commits
- Added .AppleDouble to OSX · 174c45e7
  Jonas Trevisan authored Aug 22, 2012
  
  174c45e7
- Merge branch 'master' of https://github.com/github/gitignore · d08fbbd0
  Ali Servet Donmez authored Aug 22, 2012
  
  d08fbbd0
20 Aug, 2012 1 commit
- Merge pull request #415 from honzajavorek/patch-1 · c160ad91
  Coby Chapple authored Aug 20, 2012
```
Added missing whitespaces in comments
```
  c160ad91
18 Aug, 2012 1 commit
- added missing whitespaces in comments · 2f7bc6ba
  Honza Javorek authored Aug 18, 2012
  
  2f7bc6ba
10 Aug, 2012 2 commits
- Merge pull request #406 from ecarreras/master · 76dd79a5
  Coby Chapple authored Aug 10, 2012
```
Adding PyDev files to .gitignore
```
  76dd79a5
- Merge pull request #407 from AArnott/patch-1 · d14aab9a
  Coby Chapple authored Aug 10, 2012
```
Adds .vspx and .log files to exclude for C#/VB
```
  d14aab9a
09 Aug, 2012 4 commits
- Merge pull request #348 from bjoern-esser/master · e732aa40
  Justin Spahr-Summers authored Aug 09, 2012
```
ignore bz2 files, which are bzip2 actually
```
  e732aa40
- Merge pull request #334 from mkenyon/master · fa954f29
  Justin Spahr-Summers authored Aug 09, 2012
```
Add OSX-specific Icon\r rule
```
  fa954f29
- Merge pull request #294 from yrashk/patch-1 · f453a04c
  Justin Spahr-Summers authored Aug 09, 2012
```
Don't ignore priv directory in Erlang projects
```
  f453a04c
- Merge pull request #360 from svanschu/master · b2818653
  Coby Chapple authored Aug 09, 2012
```
PHPStorm gitignore
```
  b2818653
08 Aug, 2012 4 commits
- Added .vspx and .log to .gitignore for VB · de7a7117
  Andrew Arnott authored Aug 08, 2012
  
  de7a7117
- Added .gitignore entries for .vspx and .log · 6073319f
  Andrew Arnott authored Aug 08, 2012
  
  6073319f
- Adding pydev files · 2661a820
  Eduard Carreras authored Aug 08, 2012
  
  2661a820
- Remove space after Thumbs.db — fixes #355 · 5a860949
  Coby Chapple authored Aug 08, 2012
  
  5a860949
03 Aug, 2012 17 commits
- Add .LSOverride · 6f6c2eac
  Ali Servet Donmez authored Aug 03, 2012
  
  6f6c2eac
- Merge pull request #392 from lmjabreu/patch-2 · fcb11295
  Coby Chapple authored Aug 03, 2012
```
Added file exclusions, reformatted
```
  fcb11295
- Merge pull request #395 from hugocf/patch-1 · 52398081
  Coby Chapple authored Aug 03, 2012
```
Windows XP Media Center Edition also creates ehthumbs.db
```
  52398081
- Merge pull request #400 from NameFILIP/patch-1 · 54769b40
  Coby Chapple authored Aug 03, 2012
```
Update SeamGen.gitignore
```
  54769b40
- Merge pull request #399 from bfuk/patch-2 · bc0c761e
  Coby Chapple authored Aug 03, 2012
```
Added ignore of W3TC cache folder (for users that might be using W3TC ca...
```
  bc0c761e
- Merge pull request #401 from rb2/master · 9b566a37
  Coby Chapple authored Aug 03, 2012
```
Fix Opencart gitignore
```
  9b566a37
- Merge pull request #384 from thenew/patch-1 · f43d17ee
  Coby Chapple authored Aug 03, 2012
```
add *.log (wp-content/debug.log)
```
  f43d17ee
- Merge pull request #385 from gneatgeek/master · 55f8c12a
  Coby Chapple authored Aug 03, 2012
```
Updated SASS gitignore
```
  55f8c12a
- Make CakePHP ignore config folder of either case · 67083ce7
  Coby Chapple authored Aug 03, 2012
```
This takes the change from #339 and makes it case insensitive so that CakePHP projects from both before and after the rename ignore the appropriate files.
```
  67083ce7
- Merge pull request #361 from MaxNanasy/patch-1 · f88aa40d
  Justin Spahr-Summers authored Aug 03, 2012
```
Removed redundant ".directory" that was already covered by ".*".
```
  f88aa40d
- Merge pull request #304 from mgold/master · e31878f8
  Justin Spahr-Summers authored Aug 03, 2012
```
.netrwhist
```
  e31878f8
- Merge remote-tracking branch 'arsenm/patch-1' · fae236e7
  Justin Spahr-Summers authored Aug 03, 2012
```
Conflicts:
	C.gitignore
```
  fae236e7
- Merge remote-tracking branch 'OliverLetterer/patch-1' · 8486f220
  Justin Spahr-Summers authored Aug 03, 2012
```
Conflicts:
	Objective-C.gitignore
```
  8486f220
- Merge pull request #402 from ntotten/master · 4709f02b
  Coby Chapple authored Aug 03, 2012
```
Added Windows Azure build output files
```
  4709f02b
- Merge pull request #388 from rhysd/master · ef2db786
  Justin Spahr-Summers authored Aug 03, 2012
```
ignoring *.dylib (dynamic link libraries in MacOS X)
```
  ef2db786
- Merge pull request #390 from osteslag/patch-1 · edaff200
  Justin Spahr-Summers authored Aug 03, 2012
```
Update to also ignore .DS_Store files
```
  edaff200
- Merge pull request #339 from AD7six/patch-1 · 9f413941
  Coby Chapple authored Aug 03, 2012
```
the current version of Cakephp (2.x) renamed the config folder to Config
```
  9f413941
02 Aug, 2012 1 commit
- Added NuGet packages directory · 1a2c4092
  Nathan Totten authored Aug 02, 2012
  
  1a2c4092