Commit Graph

15 Commits

Author SHA1 Message Date
Daisuke Goto da36175ff6 Fix OSX-specific Icon\r rule 2013-10-12 19:14:17 +09:00
amalrik 044043f559 change the line endings of Global/OSX from dos to unix format 2012-11-22 21:33:12 -02: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
Jonas Trevisan 174c45e796 Added .AppleDouble to OSX 2012-08-22 13:38:50 -03:00
Mike Kenyon 720975f849 Add OSX-specific Icon\r rule 2012-05-01 15:02:46 -07:00
Lucas Jenß 85de979a03 Remove "dangerous" OS X specific .gitignore rule
The .gitignore rule "Icon?" will also match directories such as
"icons/", at least on a case-insensitive file-system (this happened to
me on OS X 10.7). I only noticed this several days later because a
developer was complaining about missing icons in his repository. I don't
really know what type of files this rule is supposed to match, but I
guess the described behavior is not expected.
2011-07-27 15:33:05 +02:00
Raphael Schaad 5774649b8f In Global/OSX.gitignore .DS_Store? didn't match .DS_Store (a question mark (?) matches a single character). 2011-02-21 18:03:20 -08:00
Chris Wanstrath 9c7b92ae3b These should go into other gitignores, like Vim.gitignore 2010-11-18 18:56:40 -08:00
Daniel Schildt 771ad365e4 Added few files to OSX.gitignore
Ignore files generated by OS X that might appear on external disks:
  .Spotlight-V100
  .Trashes
2010-11-19 10:17:33 +08:00
fhemberger 0ae4801e31 Added OSX icons, moved bin/** from Java to Eclipse, added *.class to Java 2010-11-10 09:06:12 +01:00
fhemberger b568c6b5b0 Added thumbnails 2010-11-09 23:23:58 +01:00
Jeffry Degrande 4b492aedf8 ack & vim swap files 2010-11-09 15:45:44 +08:00
Dan Williams ee0e1515d2 OSX git ignore for the .DS_Store </rap> 2010-11-08 15:02:58 -08:00