Skip to content
Browse files

Merge remote-tracking branch 'origin/master' into pr/506

Conflicts:
	Yii.gitignore
  • Loading branch information...
2 parents 407664c + 8335a5d commit 1a1de190aed798e1c8179e2706ab733eda64bd71 @jspahrsummers jspahrsummers committed
Showing with 515 additions and 408 deletions.
  1. +1 −1 Actionscript.gitignore
  2. +0 −7 Android.gitignore
  3. +8 −0 C++.gitignore
  4. +4 −0 C.gitignore
  5. +34 −0 CONTRIBUTING.md
  6. +1 −1 CakePHP.gitignore
  7. +6 −0 Composer.gitignore
  8. +1 −1 Concrete5.gitignore
  9. +0 −1 Coq.gitignore
  10. +15 −3 Dart.gitignore
  11. +1 −1 Delphi.gitignore
  12. +1 −1 Drupal.gitignore
  13. +4 −0 EPiServer.gitignore
  14. +2 −1 Erlang.gitignore
  15. +5 −1 ExpressionEngine.gitignore
  16. +2 −0 Fancy.gitignore
  17. +0 −1 Finale.gitignore
  18. +1 −1 ForceDotCom.gitignore
  19. +0 −1 GWT.gitignore
  20. +4 −0 Global/Archives.gitignore
  21. +1 −1 Global/CVS.gitignore
  22. +4 −2 Global/Eclipse.gitignore
  23. +1 −1 Global/Espresso.gitignore
  24. +1 −1 Global/FlexBuilder.gitignore
  25. +0 −4 Global/IntelliJ.gitignore
  26. +20 −0 Global/JetBrains.gitignore
  27. +2 −0 Global/KDevelop4.gitignore
  28. +0 −2 Global/Linux.gitignore
  29. +1 −1 Global/Matlab.gitignore
  30. +2 −0 Global/NotepadPP.gitignore
  31. +2 −1 Global/OSX.gitignore
  32. +0 −1 Global/PhPStorm.gitignore
  33. +0 −4 Global/PyCharm.gitignore
  34. +0 −1 Global/RubyMine.gitignore
  35. +1 −1 Global/SASS.gitignore
  36. +3 −1 Global/SBT.gitignore
  37. +5 −1 Global/SublimeText.gitignore
  38. +10 −1 Global/Tags.gitignore
  39. +1 −0 Global/Vagrant.gitignore
  40. +0 −108 Global/VisualStudio.gitignore
  41. +6 −0 Global/Windows.gitignore
  42. +4 −2 Global/vim.gitignore
  43. +1 −0 Go.gitignore
  44. +0 −1 Grails.gitignore
  45. +1 −1 Joomla.gitignore
  46. +1 −1 Kohana.gitignore
  47. +1 −1 LICENSE
  48. +0 −32 LaTeX.gitignore
  49. +3 −1 Leiningen.gitignore
  50. +1 −1 LemonStand.gitignore
  51. +5 −0 Magento.gitignore
  52. +1 −2 Node.gitignore
  53. +9 −5 Objective-C.gitignore
  54. +11 −8 Perl.gitignore
  55. +0 −6 PlayFramework.gitignore
  56. +7 −0 Processing.gitignore
  57. +18 −14 Python.gitignore
  58. +2 −1 Qt.gitignore
  59. +1 −1 R.gitignore
  60. +66 −28 README.md
  61. +15 −8 Rails.gitignore
  62. +23 −12 Ruby.gitignore
  63. +20 −0 RubyMotion.gitignore
  64. +4 −1 Scala.gitignore
  65. +0 −1 Sdcc.gitignore
  66. +1 −1 Symfony.gitignore
  67. +3 −0 Symfony2.gitignore
  68. +78 −0 TeX.gitignore
  69. +3 −3 Typo3.gitignore
  70. +5 −3 Unity.gitignore
  71. +0 −99 VB.Net.gitignore
  72. +76 −19 CSharp.gitignore → VisualStudio.gitignore
  73. +1 −2 Wordpress.gitignore → WordPress.gitignore
  74. +1 −1 Yii.gitignore
  75. +0 −1 ZendFramework.gitignore
  76. +3 −0 nanoc.gitignore
View
2 Actionscript.gitignore
@@ -8,4 +8,4 @@ bin-release/
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
# should NOT be excluded as they contain compiler settings and other important
-# information for Eclipse / Flash Builder.
+# information for Eclipse / Flash Builder.
View
7 Android.gitignore
@@ -21,10 +21,3 @@ local.properties
# Proguard folder generated by Eclipse
proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
-
View
8 C++.gitignore
@@ -2,12 +2,20 @@
*.slo
*.lo
*.o
+*.obj
# Compiled Dynamic libraries
*.so
*.dylib
+*.dll
# Compiled Static libraries
*.lai
*.la
*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
View
4 C.gitignore
@@ -1,5 +1,8 @@
# Object files
*.o
+*.ko
+*.obj
+*.elf
# Libraries
*.lib
@@ -15,3 +18,4 @@
*.exe
*.out
*.app
+*.hex
View
34 CONTRIBUTING.md
@@ -0,0 +1,34 @@
+# Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
+
+- **Provide a link to the application or project’s homepage**. Unless it’s
+ extremely popular, there’s a chance the maintainers don’t know about or use
+ the language, framework, editor, app, or project your change applies to.
+
+- **Provide links to documentation** supporting the change you’re making.
+ Current, canonical documentation mentioning the files being ignored is best.
+ If documentation isn’t available to support your change, do the best you can
+ to explain what the files being ignored are for.
+
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+ take a sentence or two to tell us why your change or addition should happen.
+ It’s especially helpful to articulate why this change applies to *everyone*
+ who works with the applicable technology, rather than just you or your team.
+
+- **Please consider the scope of your change**. If your change specific to a
+ certain language or framework, then make sure the change is made to the
+ template for that language or framework, rather than to the template for an
+ editor, tool, or operating system.
+
+- **Please only modify *one template* per pull request**. This helps keep pull
+ requests and feedback focused on a specific project or technology.
+
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
+
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.
View
2 CakePHP.gitignore
@@ -4,4 +4,4 @@ tmp/*
app/tmp/*
app/[Cc]onfig/core.php
app/[Cc]onfig/database.php
-!empty
+!empty
View
6 Composer.gitignore
@@ -0,0 +1,6 @@
+composer.phar
+vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
View
2 Concrete5.gitignore
@@ -1,3 +1,3 @@
config/site.php
files/cache/*
-files/tmp/*
+files/tmp/*
View
1 Coq.gitignore
@@ -1,4 +1,3 @@
*.vo
*.glob
*.v.d
-
View
18 Dart.gitignore
@@ -1,4 +1,16 @@
-.DS_Store
-packages
+// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+packages/
.project
-pubspec.lock
+.buildlog
+*.js_
+*.js.deps
+*.js.map
+
+// Include when developing application packages
+pubspec.lock
+
+// Avoid committing generated JavaScript files
+*.dart.js
+
+// Check for any other incovenient files generated by OS
+// and other tools such as Eclipse, IntelliJ, etc.
View
2 Delphi.gitignore
@@ -7,4 +7,4 @@ __history
*.map
*.exe
*.dll
-bin/*
+bin/*
View
2 Drupal.gitignore
@@ -34,4 +34,4 @@ xmlrpc.php
/modules
/profiles
/scripts
-/themes
+/themes
View
4 EPiServer.gitignore
@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config
View
3 Erlang.gitignore
@@ -2,4 +2,5 @@
deps
*.o
*.beam
-*.plt
+*.plt
+erl_crash.dump
View
6 ExpressionEngine.gitignore
@@ -8,8 +8,12 @@ images/member_photos/
images/signature_attachments/
images/pm_attachments/
+# For security do not publish the following files
+system/expressionengine/config/database.php
+system/expressionengine/config/config.php
+
# Caches
sized/
thumbs/
_thumbs/
-*/expressionengine/cache/*
+*/expressionengine/cache/*
View
2 Fancy.gitignore
@@ -0,0 +1,2 @@
+*.rbc
+*.fyc
View
1 Finale.gitignore
@@ -11,4 +11,3 @@
# Some versions of Finale have a bug and randomly save extra copies of
# the music source as "<Filename> copy.mus"
*copy.mus
-
View
2 ForceDotCom.gitignore
@@ -1,4 +1,4 @@
.project
.settings
salesforce.schema
-Referenced Packages
+Referenced Packages
View
1 GWT.gitignore
@@ -14,4 +14,3 @@ gwt-unitCache/
# more caches and things from deploy #
war/WEB-INF/deploy/
war/WEB-INF/classes/
-
View
4 Global/Archives.gitignore
@@ -9,6 +9,7 @@
*.bz2
*.xz
*.lzma
+*.cab
#packing-only formats
*.iso
@@ -21,3 +22,6 @@
*.egg
*.deb
*.rpm
+*.msi
+*.msm
+*.msp
View
2 Global/CVS.gitignore
@@ -1,4 +1,4 @@
/CVS/*
*/CVS/*
.cvsignore
-*/.cvsignore
+*/.cvsignore
View
6 Global/Eclipse.gitignore
@@ -1,6 +1,6 @@
*.pydevproject
-.project
.metadata
+.gradle
bin/**
tmp/**
tmp/**/*
@@ -9,7 +9,6 @@ tmp/**/*
*.swp
*~.nib
local.properties
-.classpath
.settings/
.loadpath
@@ -24,3 +23,6 @@ local.properties
# PDT-specific
.buildpath
+
+# TeXlipse plugin
+.texlipse
View
2 Global/Espresso.gitignore
@@ -1 +1 @@
-*.esproj
+*.esproj
View
2 Global/FlexBuilder.gitignore
@@ -1,2 +1,2 @@
bin/
-bin-debug/
+bin-debug/
View
4 Global/IntelliJ.gitignore
@@ -1,4 +0,0 @@
-*.iml
-*.ipr
-*.iws
-.idea/
View
20 Global/JetBrains.gitignore
@@ -0,0 +1,20 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+
+## Directory-based project format
+.idea/
+# if you remove the above rule, at least ignore user-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# and these sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/
View
2 Global/KDevelop4.gitignore
@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/
View
2 Global/Linux.gitignore
@@ -1,3 +1 @@
-.*
-!.gitignore
*~
View
2 Global/Matlab.gitignore
@@ -12,5 +12,5 @@
# Compiled MEX binaries (all platforms)
*.mex*
-# Simulink Code Generation
+# Simulink Code Generation
slprj/
View
2 Global/NotepadPP.gitignore
@@ -0,0 +1,2 @@
+# Notepad++ backups #
+*.bak
View
3 Global/OSX.gitignore
@@ -1,8 +1,9 @@
.DS_Store
.AppleDouble
.LSOverride
-Icon
+# Icon must ends with two \r.
+Icon
# Thumbnails
._*
View
1 Global/PhPStorm.gitignore
@@ -1 +0,0 @@
-.idea/
View
4 Global/PyCharm.gitignore
@@ -1,4 +0,0 @@
-# PyCharm
-# http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
-.iml
View
1 Global/RubyMine.gitignore
@@ -1 +0,0 @@
-.idea/workspace.xml
View
2 Global/SASS.gitignore
@@ -1,2 +1,2 @@
-### SASS Ignores - "Sassy CSS" http://sass-lang.com/
+### Sass Ignores - "Sassy CSS" http://sass-lang.com/
*.sass-cache
View
4 Global/SBT.gitignore
@@ -4,4 +4,6 @@
target/
lib_managed/
src_managed/
-project/boot/
+project/boot/
+.history
+.cache
View
6 Global/SublimeText.gitignore
@@ -1,2 +1,6 @@
-# SublimeText project files
+# workspace files are user-specific
*.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
View
11 Global/Tags.gitignore
@@ -1,5 +1,14 @@
-# Ignore tags created by etags and ctags
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
TAGS
!TAGS/
tags
!tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
+
View
1 Global/Vagrant.gitignore
@@ -0,0 +1 @@
+.vagrant/
View
108 Global/VisualStudio.gitignore
@@ -1,108 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-
-[Dd]ebug*/
-[Rr]elease/
-
-build/
-
-
-[Tt]est[Rr]esult
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.vspscc
-*.vssscc
-.builds
-
-*.pidb
-
-*.log
-*.scc
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-
-*.[Rr]e[Ss]harper
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Publish Web Output
-*.Publish.xml
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-[Tt]est[Rr]esult*
-*.Cache
-ClientBin
-[Ss]tyle[Cc]op.*
-~$*
-*.dbmdl
-
-*.[Pp]ublish.xml
-
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-
-# NuGet
-packages/
View
6 Global/Windows.gitignore
@@ -7,3 +7,9 @@ Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
View
6 Global/vim.gitignore
@@ -1,4 +1,6 @@
-.*.sw[a-z]
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
*.un~
Session.vim
-.netrwhist
+.netrwhist
+*~
View
1 Go.gitignore
@@ -20,3 +20,4 @@ _cgo_export.*
_testmain.go
*.exe
+*.test
View
1 Grails.gitignore
@@ -41,4 +41,3 @@
# other
*.iws
-
View
2 Joomla.gitignore
@@ -393,4 +393,4 @@ tmp/*
configuration.php
index.php
joomla.xml
-*.txt
+*.txt
View
2 Kohana.gitignore
@@ -1,2 +1,2 @@
application/cache/*
-application/logs/*
+application/logs/*
View
2 LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 GitHub, Inc.
+Copyright (c) 2013 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
View
32 LaTeX.gitignore
@@ -1,32 +0,0 @@
-*.acn
-*.acr
-*.alg
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb_latexmk
-*.glg
-*.glo
-*.gls
-*.idx
-*.ilg
-*.ind
-*.ist
-*.lof
-*.log
-*.lot
-*.maf
-*.mtc
-*.mtc0
-*.nav
-*.nlo
-*.out
-*.pdfsync
-*.ps
-*.snm
-*.synctex.gz
-*.toc
-*.vrb
-*.xdy
-*.tdo
View
4 Leiningen.gitignore
@@ -2,5 +2,7 @@ pom.xml
*jar
/lib/
/classes/
-/targets/
+/target/
.lein-deps-sum
+.lein-repl-history
+.lein-plugins/
View
2 LemonStand.gitignore
@@ -18,4 +18,4 @@ install.php
/modules/shop/*
/modules/system/*
/modules/users/*
-# add content_*.php if you don't want erase client changes to content
+# add content_*.php if you don't want erase client changes to content
View
5 Magento.gitignore
@@ -15,14 +15,18 @@ app/etc/modules/Enterprise_*
app/etc/modules/Find_Feed.xml
app/etc/modules/Mage_All.xml
app/etc/modules/Mage_Api.xml
+app/etc/modules/Mage_Api2.xml
app/etc/modules/Mage_Authorizenet.xml
app/etc/modules/Mage_Bundle.xml
+app/etc/modules/Mage_Captcha.xml
app/etc/modules/Mage_Centinel.xml
app/etc/modules/Mage_Compiler.xml
app/etc/modules/Mage_Connect.xml
+app/etc/modules/Mage_CurrencySymbol.xml
app/etc/modules/Mage_Downloadable.xml
app/etc/modules/Mage_ImportExport.xml
app/etc/modules/Mage_LoadTest.xml
+app/etc/modules/Mage_Oauth.xml
app/etc/modules/Mage_PageCache.xml
app/etc/modules/Mage_Persistent.xml
app/etc/modules/Mage_Weee.xml
@@ -78,6 +82,7 @@ LICENSE.txt
LICENSE_EE*
mage
media/customer/
+media/dhl/
media/downloadable/
media/.htaccess
media/import/
View
3 Node.gitignore
@@ -11,5 +11,4 @@ pids
logs
results
-npm-debug.log
-node_modules
+node_modules
View
14 Objective-C.gitignore
@@ -1,6 +1,8 @@
-# Xcode
+# OS X
.DS_Store
-*/build/*
+
+# Xcode
+build/
*.pbxuser
!default.pbxuser
*.mode1v3
@@ -9,11 +11,13 @@
!default.mode2v3
*.perspectivev3
!default.perspectivev3
-*.xcworkspace
-!default.xcworkspace
xcuserdata
+*.xccheckout
profile
*.moved-aside
DerivedData
-.idea/
*.hmap
+*.xccheckout
+
+# CocoaPods
+Pods
View
19 Perl.gitignore
@@ -1,5 +1,5 @@
-blib/
-.build/
+/blib/
+/.build/
_build/
cover_db/
inc/
@@ -7,10 +7,13 @@ Build
!Build/
Build.bat
.last_cover_stats
-Makefile
-Makefile.old
-MANIFEST.bak
-META.yml
-MYMETA.yml
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/META.yml
+/META.json
+/MYMETA.*
nytprof.out
-pm_to_blib
+/pm_to_blib
+*.o
+*.bs
View
6 PlayFramework.gitignore
@@ -1,9 +1,3 @@
-# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
-# Ignore all dotfiles...
-.*
-# except for .gitignore
-!.gitignore
-
# Ignore Play! working directory #
db
eclipse
View
7 Processing.gitignore
@@ -0,0 +1,7 @@
+.DS_Store
+applet
+application.linux32
+application.linux64
+application.windows32
+application.windows64
+application.macosx
View
32 Python.gitignore
@@ -1,30 +1,34 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
*.py[cod]
# C extensions
*.so
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
+# Distribution / packaging
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
.installed.cfg
-lib
-lib64
+*.egg
# Installer logs
pip-log.txt
+pip-delete-this-directory.txt
# Unit test / coverage reports
+.tox/
.coverage
-.tox
nosetests.xml
+coverage.xml
# Translations
*.mo
View
3 Qt.gitignore
@@ -16,5 +16,6 @@
*.pro.user.*
moc_*.cpp
qrc_*.cpp
-Makefile
+ui_*.h
+Makefile*
*-build-*
View
2 R.gitignore
@@ -2,4 +2,4 @@
.Rhistory
# Example code in package build process
-*-Ex.R
+*-Ex.R
View
94 README.md
@@ -1,41 +1,79 @@
-# A Collection of Useful .gitignore Templates
+# A collection of `.gitignore` templates
-That's what we're trying to build. Please contribute
-by [forking][fk] and sending a [pull request][pr].
+This is GitHub’s collection of [`.gitignore`][man] file templates.
+We use this list to populate the `.gitignore` template choosers available
+in the GitHub.com interface when creating new repositories and files.
-Also **please** only modify **one file** per commit. This'll
-make merging easier for everyone.
+For more information about how `.gitignore` files work, and how to use them,
+the following resources are a great place to start:
-Global gitignores (OS-specific, editor-specific) should go into the
-`Global/` directory.
+- The [Ignoring Files chapter][chapter] of the [Pro Git][progit] book.
+- The [Ignoring Files article][help] on the GitHub Help site.
+- The [gitignore(5)][man] manual page.
-For more information on gitignore: [gitignore(5)][g5]
+[man]: http://git-scm.com/docs/gitignore
+[help]: https://help.github.com/articles/ignoring-files
+[chapter]: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files
+[progit]: http://git-scm.com/book
-[fk]: http://help.github.com/forking/
-[pr]: http://help.github.com/pull-requests/
-[g5]: http://man.cx/gitignore
+## Folder structure
+
+The files in the root directory are for `.gitignore` templates that are
+project specific, such as language or framework specific templates.
+Global (operating system or editor specific) templates should go into the
+[`Global/`](./Global) directory.
+
+## Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
-## Pull Requests
+- **Provide a link to the application or project’s homepage**. Unless it’s
+ extremely popular, there’s a chance the maintainers don’t know about or use
+ the language, framework, editor, app, or project your change applies to.
+
+- **Provide links to documentation** supporting the change you’re making.
+ Current, canonical documentation mentioning the files being ignored is best.
+ If documentation isn’t available to support your change, do the best you can
+ to explain what the files being ignored are for.
+
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+ take a sentence or two to tell us why your change or addition should happen.
+ It’s especially helpful to articulate why this change applies to *everyone*
+ who works with the applicable technology, rather than just you or your team.
+
+- **Please consider the scope of your change**. If your change specific to a
+ certain language or framework, then make sure the change is made to the
+ template for that language or framework, rather than to the template for an
+ editor, tool, or operating system.
-Since this repo includes a large and diverse
-number of programming languages, frameworks, editors,
-and ecosystems, it's **very helpful** if you can provide
-a link to information supporting your pull request.
-Up-to-date, canonical documentation that mentions the files
-to be ignored is best.
+- **Please only modify *one template* per pull request**. This helps keep pull
+ requests and feedback focused on a specific project or technology.
-This ensures we can efficiently go through pull requests
-and keep quality high.
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
-## Global Ignores
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.
-git has a global configuration that applies rules to all of
-your projects. For example:
+## Contributing workflow
- git config --global core.excludesfile ~/.global_ignore
+Here’s how we suggest you go about proposing a change to this project:
+
+1. [Fork this project][fork] to your account.
+2. [Create a branch][branch] for the change you intend to make.
+3. Make your changes to your fork.
+4. [Send a pull request][pr] from your fork’s branch to our `master` branch.
+
+Using the web-based interface to make changes is fine too, and will help you
+by automatically forking the project and prompting to send a pull request too.
+
+[fork]: http://help.github.com/forking/
+[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
+[pr]: http://help.github.com/pull-requests/
-... will apply the rules in ~/.global_ignore for all of your repos.
+## License
-This is useful if you use an editor (like Emacs) that drops backup files,
-or if you work in an environment that generates binary or intermediate
-files that are always ignored.
+[MIT](./LICENSE).
View
23 Rails.gitignore
@@ -3,16 +3,23 @@
.sass-cache
capybara-*.html
.rspec
-.rvmrc
-/.bundle
-/vendor/bundle
-/log/*
-/tmp/*
+/log
+/tmp
/db/*.sqlite3
-/public/system/*
+/public/system
/coverage/
-/spec/tmp/*
+/spec/tmp
**.orig
rerun.txt
pickle-email-*.html
-.project
+config/initializers/secret_token.rb
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
View
35 Ruby.gitignore
@@ -1,18 +1,29 @@
*.gem
*.rbc
-.bundle
.config
coverage
InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/pkg/
+/spec/reports
+/test/tmp
+/test/version_tmp
+/tmp/
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+## Documentation cache and generated files:
+/.yardoc
+/_yardoc
+/doc/
+/rdoc
+
+## Environment normalisation:
+/.bundle
+/lib/bundler/man
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
View
20 RubyMotion.gitignore
@@ -0,0 +1,20 @@
+.dat*
+.repl_history
+build/
+tags
+
+# Editor files
+.DS_Store
+nbproject
+.redcar
+*.swp
+*.swo
+~
+.eprj
+vendor/Pods
+*.nib
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
View
5 Scala.gitignore
@@ -2,6 +2,9 @@
*.log
# sbt specific
+.cache/
+.history/
+.lib/
dist/*
target/
lib_managed/
@@ -10,4 +13,4 @@ project/boot/
project/plugins/project/
# Scala-IDE specific
-.scala_dependencies
+.scala_dependencies
View
1 Sdcc.gitignore
@@ -6,4 +6,3 @@
*.rel
*.rst
*.sym
-
View
2 Symfony.gitignore
@@ -12,4 +12,4 @@ lib/model/doctrine/base/Base*
lib/model/doctrine/*Plugin/base/Base*
lib/model/om/*
lib/model/map/*
-web/*Plugin/*
+web/*Plugin/*
View
3 Symfony2.gitignore
@@ -11,3 +11,6 @@ web/bundles/*
# Configuration files
app/config/parameters.ini
app/config/parameters.yml
+
+# Composer
+composer.phar
View
78 TeX.gitignore
@@ -0,0 +1,78 @@
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+
+## Intermediate documents:
+*.dvi
+# these rules might exclude image files for figures etc.
+# *.ps
+# *.eps
+# *.pdf
+
+## Bibliography auxiliary files (bibtex/biblatex/biber):
+*.bbl
+*.bcf
+*.blg
+*-blx.aux
+*-blx.bib
+*.run.xml
+
+## Build tool auxiliary files:
+*.fdb_latexmk
+*.synctex.gz
+*.pdfsync
+
+## Auxiliary and intermediate files from other packages:
+
+# algorithms
+*.alg
+*.loa
+
+# amsthm
+*.thm
+
+# beamer
+*.nav
+*.snm
+*.vrb
+
+# glossaries
+*.acn
+*.acr
+*.glg
+*.glo
+*.gls
+
+# hyperref
+*.brf
+
+# listings
+*.lol
+
+# makeidx
+*.idx
+*.ilg
+*.ind
+*.ist
+
+# minitoc
+*.maf
+*.mtc
+*.mtc0
+
+# minted
+*.pyg
+
+# nomencl
+*.nlo
+
+# todonotes
+*.tdo
+
+# xindy
+*.xdy
View
6 Typo3.gitignore
@@ -1,4 +1,4 @@
-## Typo3
+## TYPO3 v4
# Ignore serveral upload and file directories.
/fileadmin/user_upload/
/fileadmin/_temp_/
@@ -12,7 +12,7 @@
/typo3conf/localconf_local.php
# Ignore system folders, you should have them symlinked.
# If not comment out the following two entries.
-/typo3/
-/t3lib/
+/typo3
+/t3lib
# Ignore temp directory.
/typo3temp/
View
8 Unity.gitignore
@@ -3,6 +3,8 @@
[Oo]bj/
# Autogenerated VS/MD solution and project files
-*.csproj
-*.unityproj
-*.sln
+/*.csproj
+/*.unityproj
+/*.sln
+/*.suo
+/*.user
View
99 VB.Net.gitignore
@@ -1,99 +0,0 @@
-# Build and Object Folders
-bin/
-obj/
-
-#User Specific Files
-*.user
-*.suo
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-x64/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.log
-*.vspscc
-*.vssscc
-.builds
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Publish Web Output
-*.Publish.xml
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-[Tt]est[Rr]esult*
-*.Cache
-ClientBin
-[Ss]tyle[Cc]op.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
View
95 CSharp.gitignore → VisualStudio.gitignore
@@ -1,10 +1,3 @@
-# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-[Bb]in/
-[Oo]bj/
-
-# mstest test results
-TestResults
-
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
@@ -14,11 +7,29 @@ TestResults
*.sln.docstates
# Build results
+
[Dd]ebug/
[Rr]elease/
x64/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
*_i.c
*_p.c
+*_i.h
*.ilk
*.meta
*.obj
@@ -32,10 +43,14 @@ x64/
*.tli
*.tlh
*.tmp
+*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
+*.pidb
+*.svclog
+*.scc
# Visual C++ cache files
ipch/
@@ -43,27 +58,37 @@ ipch/
*.ncb
*.opensdf
*.sdf
+*.cachefile
# Visual Studio profiler
*.psess
*.vsp
*.vspx
+# TFS 2012 Local Workspace
+$tf/
+
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
-_ReSharper*
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
-# Mindbench SASS cache
-.sass-cache/
+# DotCover is a Code Coverage Tool
+*.dotCover
# NCrunch
*.ncrunch*
+_NCrunch_*
.*crunch*.local.xml
-# Installshield output folder
-[Ee]xpress
+# Installshield output folder
+[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
@@ -76,13 +101,14 @@ DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
-publish
+publish/
# Publish Web Output
*.Publish.xml
# NuGet Packages Directory
-packages
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
# Windows Azure Build Output
csx
@@ -92,22 +118,53 @@ csx
AppPackages/
# Others
-sql
-TestResults
-[Tt]est[Rr]esult*
+sql/
*.Cache
-ClientBin
+ClientBin/
[Ss]tyle[Cc]op.*
~$*
+*~
*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
+*.dbproj.schemaview
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
+UpgradeLog*.htm
# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
View
3 Wordpress.gitignore → WordPress.gitignore
@@ -1,5 +1,4 @@
.htaccess
-wp-config.php
wp-content/uploads/
wp-content/blogs.dir/
wp-content/upgrade/
@@ -10,4 +9,4 @@ sitemap.xml
*.log
wp-content/cache/
wp-content/backups/
-sitemap.xml.gz
+sitemap.xml.gz
View
2 Yii.gitignore
@@ -3,4 +3,4 @@ assets/*
protected/runtime/*
!protected/runtime/.gitignore
protected/data/*.db
-themes/classic/views/
+themes/classic/views/
View
1 ZendFramework.gitignore
@@ -3,4 +3,3 @@ LICENSE.txt
README.txt
demos/
extras/documentation
-
View
3 nanoc.gitignore
@@ -5,3 +5,6 @@ output/
# Temporary file directory
tmp/
+
+# Crash Log
+crash.log

0 comments on commit 1a1de19

Please sign in to comment.
Something went wrong with that request. Please try again.