docs/gitignore
docs/gitignore
1
0
Fork 0
mirror of https://github.com/github/gitignore synced 2024-11-26 21:54:22 +01:00
Code Issues Releases Wiki Activity
1,990 Commits 8 Branches 0 Tags 13 MiB
a392c48ccf
Commit Graph

383 Commits

Author SHA1 Message Date
Thomas Queste
a7e4e3af05 Ignore iml file anywhere 
Intellij's iml file can be anywhere on the path.
This is true for multi-module maven project where each module has its own $projectName.iml file in its own directory.
 2014-10-16 15:53:23 +02:00
leandrodeleite
ca4a3db967 Remove trailing space 2014-10-15 12:41:48 -03:00
Iori ONDA
8b37dbd824 Adding .cask directory to Global/Emacs.gitignore 2014-10-15 16:06:43 +09:00
Thomas Hunsaker
0b51b6e485 Added New Files created by Crashlytics Plugin 
These are relatively new, the crashlytics.properties file contains the secret and can [alternatively](https://plus.google.com/+AntonioBertucci/posts/S9krjvXfgfm) contain the apikey to rid your repo of the extra strings file.
 2014-09-29 23:47:10 -07:00
thurask
2201df76be Add user-specific settings to Momentics.gitignore 
The .settings folder contains all of the user-specific preferences for Momentics (like it does for Eclipse, since they're the same underneath). Should be local only.
 2014-09-23 01:07:37 -04:00
Ricardo Fuhrmann
6563b1ae81 Typo in Jetbrains gitignore 2014-09-17 09:13:03 -04:00
Carl Suster
98766b326c Merge pull request #1208 from mstrcnvs/patch-1 
Adding new file generated by the built-in venv module in Python 3
 2014-09-15 12:02:46 +10:00
thurask
52d61fc032 Add compiled translations to Momentics.gitignore 
This .gitignore now ignores everything that build clean gets rid of
 2014-09-13 01:56:41 -04:00
Rafael Canovas
d0c43882ea Adding new file rule generated by the built-in venv module in Python 3 
As described on https://docs.python.org/dev/library/venv.html#creating-virtual-environments
 2014-09-11 17:30:27 -03:00
Carl Suster
5a339cce0d Merge pull request #1193 from github/remove-quartus2 
[Global/Quartus2] Remove template
 2014-09-11 11:21:37 +10:00
Glaived
a30beca8ba Remove *.pyc 2014-09-01 17:24:30 +02:00
Glaived
e72ab2ab34 Merge branch 'master' of https://github.com/github/gitignore 2014-09-01 17:22:58 +02:00
Carl Suster
a59d160837 Remove Quartus2 template 
The template hasn't been touched since it was added to this collection.
There are some problems with it - mainly that it's hard to know if these
rules are all still relevant, and the large prose block is probably more
confusing than helpful here.
 2014-09-02 00:23:10 +10:00
Carl Suster
765ec99d49 Merge branch 'fix-1165' 2014-09-01 14:58:35 +10:00
Carl Suster
57f117945e Tidy up the JetBrains comments 
Amends #1165
 2014-09-01 14:56:15 +10:00
malheleco
c3751cac16 add shortcut files 2014-08-21 20:45:30 +02:00
gazebodude
1f6d881044 Create LyX.gitignore 
Ignores *.lyx~ (crash recovery) and *.lyx# (timed autosave) files generated by LyX - the document processor.
 2014-08-19 14:11:11 +10:00
Carl Suster
4e273aea2a Merge pull request #1105 from thurask/momentics 
Create Momentics.gitignore
 2014-08-15 23:47:55 +10:00
Gaël Demette
fd5fabb39e Typo fix + Plugin configuration + UI specific file 2014-08-13 22:55:43 +02:00
Glaived
fc98caa730 Adding cache files and binary files 2014-07-27 18:46:05 +02:00
Sam Duke
7ce5fbcea5 change iml 
guess that root iml needs to be ignored and others need to be shared
 2014-07-15 12:06:15 +01:00
Sam Duke
d4e192ffee Updated following feedback 
removed the iml filter - this is my current best understanding of the docs, but I'm still unsure
 2014-07-15 11:57:37 +01:00
Sam Duke
9802c2cfd8 Update JetBrains.gitignore 
To clarify when to ignore/include *.imls as per https://intellij-support.jetbrains.com/entries/23393067

also added optionals from the same
 2014-07-14 12:21:40 +01:00
Carl Suster
68e79f379d Make ninja a global template. 
Amends #1084
 2014-07-08 18:13:34 +10:00
thurask
f380ad40c4 Add arm-p folder 
arm-p is another compiled output folder, for device-profile builds
 2014-06-13 20:27:05 -04:00
thurask
53441c0cd6 Create Momentics.gitignore 
Ignore debug/release builds (those go in Releases)
 2014-06-10 15:25:31 -04:00
Daniel Rothmaler
2399ff1c79 Re-order rules for JetBrains legacy project format 
Fixes #1090 - this is the part of that PR that seems justified.
 2014-05-29 11:13:28 +10:00
Carl Suster
097db81c08 Merge pull request #1069 from github/sbt 
[Global/SBT] Fix documentation URL
 2014-05-26 11:32:52 +10:00
Carl Suster
48e703a2c2 Remove stray whitespace 
Amending #1072
 2014-05-07 21:22:24 +10:00
rasbt
bd0a82e1d5 added gitignore for IPython notebooks 2014-05-06 14:48:13 -04:00
rasbt
deebadef07 added gitignore for IPython notebooks 2014-05-06 14:47:52 -04:00
Carl Suster
08f0247f17 Fix URL in SBT template 2014-05-06 17:19:27 +10:00
Michael S. Christensen
d4c7dbcaf9 Ignor auctex auto-folder and contents 
When working with multifile LaTeX-documents in AUCTeX in emacs, it creates the auto-folder to keep track of styles, macros etc. in the whole document. Unnecessary of versioning purposes.
 2014-04-17 18:21:11 +02:00
Carl Suster
fe0df6046b Merge pull request #1040 from NSElvis/master 
Ignore xcuserstate
 2014-04-16 17:55:38 +10:00
Michael S. Christensen
a64bf75ee3 Added .rel-files 
Reftex adds these for internal processing, only auxillary files for composition and compilation of tex-documents.
 2014-04-16 08:51:19 +02:00
Elvis Nuñez
37372e0f64 Ignore xcuserstate 
xcuserstate files are generated from within Xcode and saved in your project bundle to remember your last opened file, the open state of any group folders, open tabs, and any other user setting your project might need to remember, this is something that shouldn't be tracked in version control
 2014-04-15 18:59:29 +02:00
Lukas Böcker
bc6f3751b2 Fixed typo in comment 2014-04-15 16:19:56 +02:00
Carl Suster
794fe44dee Merge pull request #1033 from carpii/osx_tweak 
Ignore more osx/afp clutter
 2014-04-12 22:25:09 +10:00
Carpii (iMac)
5ec3f132d5 Ignore more osx/afp clutter 2014-04-11 13:20:47 +01:00
Carl Suster
b3d27fcf04 Merge branch 'fix-1022' 
Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.
 2014-04-06 10:38:40 +10:00
Carl Suster
5f42238331 Remove Obj-C-specific hmap & ipa from general Xcode template 2014-04-06 10:38:24 +10:00
Carl Suster
1ee8dd15d6 Merge pull request #928 from dlion/sftp 
gitignore to ignore sftp Sublime Text config file
 2014-04-04 22:38:08 +11:00
Domenico LucianI
1314783d11 Moved to global 2014-04-04 12:01:26 +02:00
Jim Roepcke
d598b29b04 Remove profile rule from Xcode template. Fixes #956 2014-04-04 17:21:06 +11:00
Carl Suster
977641c6f6 Merge pull request #1015 from carpii/master 
Updated OSX.gitignore to include directories commonly created on AFP shares
 2014-04-04 12:05:14 +11:00
Ivan Zuzak
5342e13bc9 ensure single trailing newline 2014-03-27 17:04:56 +01:00
Carpii (iMac)
b7d5856485 Updated OSX.gitignore to include directories commonly created on AFP shares 2014-03-26 12:40:20 +00:00
Steven Noto
485a600a77 Added bin-release folder 
Updated to include 'bin-release' folder, another folder for generated binary builds
 2014-03-25 15:14:14 -05:00
MacPro: Fabien Sanglard
5bd4330b8c Add Xcode support. 2014-03-19 19:14:15 -04:00
John Munkhoff
ddcbdd6a17 Edit comment in Global/SlickEdit.gitignore 
Remove unnecessary wording about negative ignore rules.
 2014-03-18 23:37:25 -07:00
John Munkhoff
a65b95938c Add Global/SlickEdit.gitignore file 
This commit adds a global ignore file for SlickEdit, a commercial editor.

SlickEdit will create the following files when the user sets up a workspace:

*.vpw       Workspace file. Contains a list of project files associated with
            the workspace.
*.vpj       Project file. Contains the project’s settings, including the list
            of source files.
*.vpwhist   Workspace history file for Windows. Contains user session
            information (list of open files, debugger breakpoints, etc.)
*.vpwhistu  Workspace history file for UNIX/Linux/MacOSX. (Same as above.)
*.vtg       Workspace tag file. Contains a database of source code symbols.

It is assumed that GitHub users will generally not want to store their
workspace and project files in a repository, so those files are ignored
globally.  However, those files do not contain user-specific data so they
could be stored in a repository and shared among developers if desired for
a particular project.  This can be done by adding rules like ’!*.vpw’ and
‘!*.vpj’ to the project’s .gitignore file.

The workspace history and tag files contain user-specific data, so they
should not be stored in a repository.

For more information, download the PDF user guide from:
http://www.slickedit.com/products/slickedit/product-documentation

Note: The user guide is 1400 pages long and over 13MB in size.

Searching for ‘vpwhist’ will lead to the section that discusses storing
these files in a repository.
 2014-03-18 16:21:03 -07:00
Carl Suster
eda2ee70de Merge pull request #990 from chiragsanghavi/master 
Remove duplicate line in Global/webMethods template
 2014-03-08 11:02:37 +11:00
chirag sanghavi
9280c7e331 removed duplicate 2014-03-07 17:27:59 -05:00
ssinss
b3b6865ad3 Update JetBrains.gitignore 2014-03-07 00:10:38 +09:00
Carl Suster
69b99dd091 Merge pull request #963 from tioui/eiffelstudio 
Adding a global template for EiffelStudio
 2014-02-28 23:26:00 +11:00
Carl Suster
121cbc3b73 Merge pull request #945 from arcresu/sass-cache 
Simplify sass cache rules
 2014-02-28 23:21:39 +11:00
Dennis Xiloj
13c119f167 Added ignore for directory config under KDE 
Dolphin, the KDE file manager, writes specific directory configuration in .directory files.
 2014-02-28 00:26:43 -06:00
Louis M
009b474870 Move the EiffelStudio.gitignore in the Global directory 2014-02-27 21:41:28 -05:00
Carl Suster
503bde5d24 Merge Sass and Compass templates 2014-02-21 10:39:43 +11:00
jturmel
9a0f32a452 Remove AndroidStudio, modify Global/JetBrains 
* Remove AndroidStudio.gitignore in favor of adding the
  change needed to the Global/JetBrains.gitignore file
 2014-02-12 10:40:56 -06:00
Christoph Emmersberger
38cbefd1c4 Update JetBrains.gitignore 
Add plugin file description for JIRA config file containing username and password
 2014-02-06 19:00:54 +01:00
Adam Roben
5979282c55 Merge pull request #912 from stuartpb/patch-1 
Update Cloud9.gitignore
 2014-01-06 19:53:53 -08:00
Stuart P. Bentley
446ba8454d Update Cloud9.gitignore 
The next version of Cloud9 will use a top-level .c9 folder in the workspace for settings and metadata.
 2014-01-02 16:51:35 -08:00
Arinto Murdopo
791e8ed0ae Add output directory of sbteclipse plugin, 
which is ".target" directory.
 2013-12-25 07:48:34 +08:00
Adam Roben
43c205b5df Merge pull request #862 from jaseemabid/emacs 
Ignore elpa and eshell generated files
 2013-11-26 19:56:16 -08:00
Adam Roben
cea67aabe0 Merge pull request #853 from danieljabailey/master 
Add Lazarus IDE ignore file (in global dir this time)
 2013-11-26 19:50:24 -08:00
Adam Roben
926389c7cc Merge pull request #849 from Danimoth/patch-1 
Change Eclipse.gitignore to correctly handle bin/ and tmp/ directories
 2013-11-26 19:48:19 -08:00
Adam Roben
51a1221f50 Merge pull request #835 from ggirou/master 
Move editor specific files into a new DartEditor.gitignore
 2013-11-26 19:37:23 -08:00
Adam Roben
ddef3121c6 Merge pull request #728 from zyrx/master 
DW Dreamweaver added files
 2013-11-26 19:32:13 -08:00
Jaseem Abid
207cddf155 Ignore elpa and eshell generated files 2013-11-14 11:00:49 +05:30
Justin Spahr-Summers
f0f5e38db2 Merge pull request #760 2013-11-13 14:19:22 -08:00
Justin Spahr-Summers
4a7ab06382 Remove generic and Java ignore patterns 
Those belong in other ignore files.
 2013-11-13 14:19:16 -08:00
unknown
e57da65843 Moved file to Global 2013-11-13 15:19:36 -05:00
Daniel Bailey
27569799cb Added lazarus ignore file in the global dir this time 2013-11-13 18:33:14 +00:00
Alexander Karatarakis
3ade853604 Update Eclipse.gitignore 2013-11-13 03:14:12 +02:00
Adam Roben
af405251f0 Merge pull request #730 from Lazersmoke/patch-1 
Added Kate ignore file in Global folder
 2013-11-12 08:11:17 -08:00
Adam Roben
de877c3e23 Merge pull request #681 from filipelenfers/master 
Ensime ignores
 2013-11-12 08:07:58 -08:00
Adam Roben
fc73773a74 Merge pull request #645 from pxqr/master 
Ignore emacs flymake-mode temp files.
 2013-11-12 08:04:57 -08:00
Adam Roben
b04b8b24aa Merge pull request #561 from stuartpb/cloud9 
Add Cloud9 gitignore
 2013-11-12 07:51:08 -08:00
Adam Roben
4dd9d7376d Merge pull request #591 from mjgardner/master 
fixing pattern for compiled elisp
 2013-11-12 07:42:54 -08:00
Ivan Yatskevich
94a2b3b668 add .idea_modules/ to Global/JetBrains.gitignore 2013-11-12 14:38:34 +03:00
Adam Roben
a1e656a093 Merge pull request #443 from bungeshea/BricxCC 
Added Bricx Command Center gitignore
 2013-11-11 11:31:13 -08:00
Shea Bunge
9345b6b461 Add comment to BricxCC.gitignore 2013-11-12 06:28:53 +11:00
Shea Bunge
8cbac43dab Move BricxCC.gitignore to Global directory 2013-11-12 06:27:39 +11:00
Adam Roben
2fea1b6b92 Merge pull request #831 from arcresu/idea 
Consolidate various IDE tempates into Global/JetBrains template
 2013-11-11 05:25:58 -08:00
Adam Roben
9463c86d9b Merge pull request #424 from MichaelMBishop/master 
added NotepadPP.gitignore for Notepad++
 2013-11-11 05:15:35 -08:00
Guillaume Girou
12d95d1ff8 Move editor specific files into a new DartEditor.gitignore 2013-11-10 17:28:41 +01:00
Carl Suster
9ae01d0b64 Rename template IDEA->JetBrains 2013-11-09 08:14:41 +11:00
Carl Suster
af886f72c8 Add back out/ for IntelliJ under IDEA 2013-11-09 08:04:35 +11:00
Carl Suster
af9ec6115c Add .idea/tasks.xmk to IDEA ignore suggections 2013-11-09 07:36:40 +11:00
Carl Suster
fcf0a9ccab Remove individual JetBrains IDE templates in favour of IDEA template 2013-11-09 07:28:12 +11:00
Carl Suster
aa00e7f210 Add an IDEA template to cover all related IDEs 2013-11-09 07:28:12 +11:00
Carl Suster
3dadf4e9b3 Make sublime-project rule off by default 2013-11-09 06:37:52 +11:00
Carl Suster
024d6e83fc Add comment to prevent *.sublime-project being ignored. 
Based on advice in the documentation at
http://www.sublimetext.com/docs/2/projects.html
 2013-11-09 06:37:52 +11:00
Adam Roben
684a4fe44b Merge pull request #805 from Utumno/patch-1 
.classpath and .project files are *meant to be versioned*
 2013-11-07 19:44:43 -08:00
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
Utumno
5627d20401 .classpath and .project files are *meant to be versioned* 
As is clearly stated in the [eclipse documentation](http://wiki.eclipse.org/FAQ_How_do_I_set_up_a_Java_project_to_share_in_a_repository%3F).  
This gitignore has lead to much confusion in SO - please ammend

I would guess the same is true for .pydevproject and .cproject but can't
be sure/do not have any references on those

Also .launch configurations are generally meant to be versioned when
saved under project location. See for instance :
http://stackoverflow.com/a/337317/281545
 2013-10-12 22:28:01 +03: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
Sam Quinn
5f35f30b04 Added Kate ignore file 
ignores .<filename>.kate-swp and (older version?) .swp.<filename>
see http://bit.ly/14XyBgW and http://bit.ly/chKUoZ
 2013-08-04 22:25:21 -05:00
Lech H. Conde
c83782755f DW Dreamweaver added files 
A lot of web designers still uses DW, thats why its necessary.
 2013-07-31 12:56:24 -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
Filipe Pais Lenfers
c173b00b32 Add Ensime specific ignores 2013-06-13 16:35:13 -03:00
Sam T
ae0d13d31c Ignore emacs flymake-mode temp files. 2013-05-10 01:35:12 +04:00
stationkeeping
923acecd29 Fixed SASS case (It's Sass, not SASS) 2013-05-09 09:50:44 +02:00
Mark Gardner
cd5b0112a4 Emacs gitignore gitignore mode because recursion 2013-03-19 16:43:04 -04:00
Mark Gardner
2d8461d42c actually ignore compiled elisp with pattern 2013-03-19 16:17:11 -04: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
Stuart P. Bentley
39d25ad962 Add Cloud9 gitignore 2013-02-17 21:28:52 -08: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
Michael Metcalf Bishop
33567b0374 Added NotepadPP.gitignore for Notepad++ 
.bak extension for backup files
 2012-08-31 17:52:51 -05: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