aboutsummaryrefslogtreecommitdiffstats
path: root/Global
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1550 from photodude/patch-1Brendan Forster2016-03-061-0/+4
|\ | | | | Add the other Dreamweaver added files
| * Add the other Dreamweaver added filesphotodude2015-06-111-0/+4
| |
* | Merge pull request #1598 from rdalkire/patch-1Brendan Forster2016-03-061-1/+1
|\ \ | | | | | | Update CVS.gitignore
| * | Update CVS.gitignorerdalkire2015-07-221-1/+1
| | | | | | | | | I added and tested another leading asterisk to deal with the CVS directories further down the tree.
* | | Merge pull request #1807 from rlee287/eclipse-recommenderBrendan Forster2016-03-061-0/+1
|\ \ \ | | | | | | | | Added Eclipse Recommenders to Eclipse gitignore
| * | | Added Eclipse Recommenders to Eclipse gitignorerlee2872015-12-191-0/+1
| | | |
* | | | Merge pull request #1867 from yoLotus/emacs-projectileBrendan Forster2016-03-061-0/+3
|\ \ \ \ | | | | | | | | | | add .projectile file to emacs .gitignore
| * | | | add .projectile file to emacs .gitignoreEtienne Bazin2016-02-191-0/+3
| | | | |
* | | | | Merge pull request #1559 from tjrana/dropbox-gitignoreBrendan Forster2016-03-061-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Add Dropbox.gitignore
| * | | | | Add Dropbox.gitignoreTJ Rana2015-06-181-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1871 from guenti/masterBrendan Forster2016-02-261-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Update Vim.gitignore
| * | | | | Update Vim.gitignoreMario Guenterberg2016-02-221-0/+2
| | |/ / / | |/| | | | | | | | Added auto-generated tag files.
* / | | | Update Jetbrains .gitignore dataSources.local.xmlRaman Gupta2016-02-251-0/+1
|/ / / /
* | | | Merge remote-tracking branch 'upstream/master'Jonathan Chu2016-02-1113-31/+72
|\ \ \ \
| * | | | Added Library Mappings and VCS RootRoberto Novelo2016-02-101-0/+2
| | | | | | | | | | | | | | | These files differ on Windows and OS X.
| * | | | Merge pull request #1846 from mcandre/octave-session-infoBrendan Forster2016-02-101-0/+3
| |\ \ \ \ | | | | | | | | | | | | matlab: ignore octave session info
| | * | | | matlab: ignore octave session infoAndrew Pennebaker2016-02-061-0/+3
| | | | | |
| * | | | | Remove redundancy in Global/Vim.gitignoreNoah Lovelady-Allen2016-02-071-2/+0
| | | | | | | | | | | | | | | | | | Anything matched by `*.un~` will also be matched by the last rule, `*~`.
| * | | | | Merge pull request #1791 from Oddj0b/CalabashBrendan Forster2016-01-281-0/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Based on a template from jmoody
| | * | | | | Move Calabash to GlobalVillars Gimm2016-01-271-0/+10
| | | | | | |
| * | | | | | Add Code Recommenders directoryJulien Carsique2016-01-271-0/+3
| | | | | | | | | | | | | | | | | | | | | Code Recommenders introduced in Eclipse Luna (4.5) creates a .recommenders directory at the root of the workspace, like .metadata
| * | | | | | Update reference article linkRay Fang2016-01-271-1/+1
| | | | | | |
| * | | | | | Merge upstream changesRay Fang2016-01-2718-35/+119
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #1546 from Coeur/patch-1Brendan Forster2016-01-271-4/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | DerivedData and xcuserdata are folders; *.xcuserstate is always inside
| | | * \ \ \ \ \ Merge branch 'master' into patch-1Antoine Cœur2015-08-152-2/+3
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Add ignore for npm debug log files Add KiCad ignore for .bck and .kicad_pcb-bak Correct capitalisation of LightSwitch and omit generated.parameters.xml Add newline at EOF Add ignores for Visual Studio Lightswitch build output Adding optional ignore proposal for wwwroot folder Ignore NCrunch temporary files. Update Dart.gitignore Added .stack-work/ directory to Haskell .gitignore. add Android Studio to the covers list Ignore Default RSpec State File Ignore *.auxlock files created by TikZ in TeX Ignore files created by `\tikzexternalize` Update Typo3.gitignore for CMS v6.2 [ObjC][Swift] Ignore Xcode SCM blueprint files include preamble files generated by mylatexformat package Add .jar, .exe and .msi Remove .SRCINFO (and old .AURINFO) from .gitignore Add CMakeScripts directory ignore OAuth2 token ... Conflicts: Objective-C.gitignore Swift.gitignore
| | | * | | | | | DerivedData and xcuserdata are folders; *.xcuserstate is always inside ↵Antoine Cœur2015-06-081-3/+2
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | xcuserdata folder
| | * | | | | | Merge pull request #1542 from barraponto/patch-1Brendan Forster2016-01-271-0/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Document Vim file patterns
| | | * | | | | | document Vim file patternsCapi Etheriel2015-06-051-0/+4
| | | |/ / / / /
| | * | | | | | Merge pull request #1387 from tyutyutyu/patch-1Brendan Forster2016-01-271-0/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Tern plugin to Eclipse.gitignore
| | | * | | | | | Add Tern plugin to Eclipse.gitignoreIstván Földházi2015-01-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Tern plugin generate a '.tern-project' file in the project directory. (https://github.com/angelozerr/tern.java/wiki/Tern-Eclipse-IDE)
| | * | | | | | | Ignore default Emacs server auth dirChristopher Warrington2016-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server-auth-dir is where Emacs stores authentication files for Emacs servers (running over TCP). These are (usually) ephemeral in nature, and should be ignored.
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into patch-1Michiel Sikma2016-01-2123-23/+148
| | |\ \ \ \ \ \ \
| | | * | | | | | | Commentsmimibar2016-01-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just added some comments. Some of us don't need some of the lines in the file.
| | | * | | | | | | Include lib64 for virtualenvJames Elford2016-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On systems that require a lib64, virtualenv creates a symlink to the local lib.
| | | * | | | | | | Merge pull request #1629 from raabf/fuse_hiddenBrendan Forster2016-01-011-0/+3
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fuse hidden
| | | | * | | | | | | improve description of .fuse_hiddenFabian Raab2015-08-241-1/+1
| | | | | | | | | | |
| | | | * | | | | | | add .fuse_hidden* to LinuxFabian Raab2015-08-241-0/+3
| | | | | | | | | | |
| | | * | | | | | | | Update Eclipse.gitignoreDmitry Rosolko2015-12-311-1/+0
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | Remove .gradle because it is not eclipse specific and already added in Gradle.gitignore.
| | | * | | | | | | Fix few typosJustas Brazauskas2015-12-131-1/+1
| | | | | | | | | |
| | | * | | | | | | Update to include iMPACT and Core Generator filesStephen2015-12-061-0/+10
| | | | | | | | | |
| | | * | | | | | | Remove *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and ↵Nick Brook2015-11-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift.gitignore
| | | * | | | | | | add *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and ↵chenyufeng2015-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift.gitignore
| | | * | | | | | | NetBeans file nb-configuration.xml should not be ignored.Mike Duigou2015-11-051-1/+0
| | | | | | | | | |
| | | * | | | | | | Update Eclipse.gitignoreIstván Földházi2015-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ignore for STS's .springBeans file
| | | * | | | | | | Update JetBrains.gitignoreThomas Steinholz2015-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a forgotten IDE to the .gitignore documentation. Why? For completeness and correctness What? [Webstorm](https://www.jetbrains.com/webstorm).
| | | * | | | | | | Merge pull request #1656 from paolofulgoni/powerpointBrendan Forster2015-10-141-0/+3
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add rule for MS PowerPoint temporary files
| | | | * | | | | | | Add rule for MS PowerPoint temporary filesPaolo Fulgoni2015-09-111-0/+3
| | | | | | | | | | |
| | * | | | | | | | | Update VirtualEnv.gitignoreMichiel Sikma2014-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore .venv files created by virtualenvwrapper and virtualfish for auto-activation purposes.
| * | | | | | | | | | Update JetBrains.gitignore according to the knowledge base articleRay Fang2015-04-141-18/+12
| | | | | | | | | | |
* | | | | | | | | | | Ignore all Emacs flycheck_*.el filesJonathan Chu2015-10-111-0/+3
| |_|/ / / / / / / / |/| | | | | | | | |