aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add .xccheckout to Objective-C gitignoreBart2013-09-171-0/+1
| | | This is a file that Xcode 5 uses for version control, doesn't need to be checked in. Also see http://stackoverflow.com/a/18448100/1877078
* Merge pull request #735 from aldo-roman/patch-1Charlie Somerville2013-08-261-0/+1
|\ | | | | added secret_token.rb
| * added secret_token.rbAldo Román Nureña2013-08-121-0/+1
| | | | | | I added secret_token.rb file to the gitignore as there are public repos sharing it.
* | Merge pull request #714 from mattjeffery/ignore_kernel_objectsCharlie Somerville2013-08-261-0/+1
|\ \ | |/ |/| Ignore kernel object files
| * ignore kernel object filesMatt Jeffery2013-07-191-0/+1
|/
* Merge pull request #576 from nysa/masterJustin Spahr-Summers2013-07-031-1/+1
|\ | | | | Ignore Vim untitled and unsaved buffer swapfiles
| * Ignore Vim untitled and unsaved buffer swapfilesNysa2013-03-061-1/+1
| | | | | | | | | | Vim creates buffer swapfiles starting at .swp for buffers that are active but untitled and unsaved.
* | Merge pull request #493 from strugee/masterJustin Spahr-Summers2013-07-031-0/+3
|\ \ | | | | | | This repository didn't have a CONTRIBUTING.md file. Now it does.
| * | add a CONTRIBUTING.md fileAlex Jordan2012-12-221-0/+3
| | | | | | | | | add a CONTRIBUTING.md file, copied verbatim from the "Pull Requests" section in README.md
* | | Remove Podfile.lock from Objective-C ignoresJustin Spahr-Summers2013-07-031-1/+0
| | | | | | | | | Per discussion in #148.
* | | Merge remote-tracking branch 'matzew/master' (pull request #418)Justin Spahr-Summers2013-07-021-0/+4
|\ \ \
| * | | Adding CocoaPods to gitignoreMatthias Wessendorf2013-07-021-0/+4
|/ / /
* | | Merge pull request #694 from anurse/patch-1Paul Betts2013-06-281-0/+3
|\ \ \ | | | | | | | | Unignore "packages/*/build" in VisualStudio.gitignore.
| * | | Unignore "packages/*/build" in VisualStudio.gitignore.Andrew Nurse2013-06-281-0/+3
|/ / /
* | / Update LICENSETed Nyman2013-05-251-1/+1
| |/ |/|
* | Merge pull request #523 from shanselman/patch-1Phil Haack2013-01-241-0/+1
|\ \ | | | | | | Updated to exclude *.publishsettings
| * | Updated to exclude *.publishsettingsScott Hanselman2013-01-241-0/+1
|/ / | | | | Updated to exclude *.publishsettings
* | Merge pull request #507 from 0xAX/masterAlan Rogers2013-01-221-1/+2
|\ \ | | | | | | Erlang.gitignore erlang.crash.dump added
| * | Erlang.gitignore erlang.crash.dump added0xAX2013-01-141-1/+2
| |/
* | Merge pull request #474 from zhaojunmeng/masterJustin Spahr-Summers2013-01-221-1/+2
|\ \ | | | | | | Add *~ to ignore vim temp file.
| * | Add *~ to ignore vim temp file.zhaojunmeng2012-11-141-1/+2
| | |
* | | Merge pull request #508 from alloy/masterJustin Spahr-Summers2013-01-221-2/+0
|\ \ \ | | | | | | | | [Objective-C] No longer ignore `xcworkspace` documents.
| * | | [Objective-C] No longer ignore `xcworkspace` documents.Eloy Durán2013-01-151-2/+0
| | |/ | |/| | | | | | | | | | | | | | | | Workspaces are real documents that can be opened, just like `xcodeproj` documents. These documents are also generated/used by CocoaPods to configure a project’s dependencies. For these reasons, there does not seem a good reason to ignore these any longer.
* | | Merge pull request #519 from Haacked/visualstudio-teamcityPhil Haack2013-01-221-1/+3
|\ \ \ | | | | | | | | VisualStudio: Add TeamCity exclusion
| * | | VisualStudio: Add TeamCity exclusionSnakiej2013-01-221-1/+3
|/ / / | | | | | | | | | Exclude folders created by the TeamCity VS plugin.
* | | Merge pull request #514 from bristol/vim-swapfile-fixMatt Burke2013-01-221-1/+1
|\ \ \ | | | | | | | | Changed line matching vim swapfiles to use all names it will create
| * | | Changed line matching vim swapfiles to use all names it will create as ↵andy bristol2013-01-211-1/+1
| | | | | | | | | | | | | | | | described in http://vimdoc.sourceforge.net/htmldoc/recover.html#E326
* | | | Merge pull request #518 from Haacked/more-pr-consolidationPhil Haack2013-01-221-1/+1
|\ \ \ \ | | | | | | | | | | More pr consolidation
| * | | | Update Global/VisualStudio.gitignoreMatt Cooper2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | Visual Studio 2010 Express for Windows Phone seems to generate .cachefile files.
| * | | | Remove inclusion of repositories.configHaacked2013-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use package restore, you actually don't want this file included. It's not needed. It's only needed if you version packages. AKA, you only need this file if you are not ignoring the "packages" folder.
* | | | | Merge pull request #517 from steveoh/patch-1Phil Haack2013-01-221-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Update VisualStudio.gitignore for vs 2012 web deploy setting.
| * | | | Update VisualStudio.gitignoresteve2013-01-221-0/+1
| | | | | | | | | | | | | | | New web deploy file name? vs 2012 added this to my solution and it shouldn't go to an open repo.
* | | | | Merge pull request #516 from Haacked/dotnet-gitignore-pr-consolidationPhil Haack2013-01-221-9/+15
|\ \ \ \ \ | |/ / / / |/| | | | Dotnet gitignore pr consolidation
| * | | | VisualStudio: ignore .dotcover files.Paul Stack2013-01-221-0/+3
| | | | |
| * | | | VisualStudio: Include the packages/repositories.config file.Kristian Hellang2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | I agree to ignore the NuGet packages folder, but I really think you should check in the repositories.config so NuGet PackageRestore can do it's magic when someone pulls the code and tries to build it...
| * | | | VisualStudio: Ignore vi's *~ temp filesAndrew Arnott2013-01-221-0/+1
| | | | |
| * | | | VisualStudio: Remove dupes, add trailing slashes, etc.neogic2013-01-221-9/+8
| | | | | | | | | | | | | | | | | | | | Add trailing slashes to folders, RS rule comment, remove dupes.
| * | | | VisualStudio: Ignore *.tmp_projsgm2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | This might be created temporarily during a build.
| * | | | VisualStudio: Ignore update log HTML fileBernhard Döbler2013-01-221-0/+1
|/ / / / | | | | | | | | | | | | VS2012 creates UpdateLog2.htm - not needed in git repository
* | | | Merge pull request #492 from Haacked/consolidate-dotnet-settingsPhil Haack2013-01-223-219/+37
|\ \ \ \ | |/ / / |/| | | Consolidate CSharp and VB.NET gitignore files into VisualStudio one.
| * | | Ignore crap from MacsPhil Haack2013-01-221-0/+3
| | | | | | | | | | | | Cross platform .NET Dev FTW!
| * | | Ignore .pfx files such as Windows Store KeyPhil Haack2013-01-221-1/+1
| | | |
| * | | Remove CSharp and VB.NET ignore filesHaacked2012-12-192-212/+0
| | | | | | | | | | | | | | | | | | | | These files were redundant. They had almost exactly the same settings. They are being replaced by the VisualStudio file.
| * | | Merge missing CSharp/VB settinsg into VisualStudioHaacked2012-12-191-10/+37
| | | | | | | | | | | | | | | | | | | | The VisualStudio gitignore file was missing a few useful settings contained in the CSharp and VB.NET gitignore files.
| * | | Move VisualStudio file from Global to main listHaacked2012-12-191-0/+0
| |/ /
* | | Merge pull request #329 from svkampen/patch-1Daniel Hengeveld2013-01-201-0/+1
|\ \ \ | | | | | | | | Added __pycache__
| * | | Removed comment.Sam van Kampen2013-01-131-2/+0
| | | |
| * | | Added __pycache__Sam van Kampen2012-04-281-0/+3
| | | |
* | | | Merge pull request #445 from bungeshea/WordPressDaniel Hengeveld2013-01-201-0/+0
|\ \ \ \ | |_|/ / |/| | | Rename Wordpress.gitignore to WordPress.gitignore
| * | | Renamed Wordpress.gitignore to WordPress.gitignoreShea Bunge2013-01-191-0/+13
| | | | | | | | | | | | | | | | WordPress should *always* have a capital P!