Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions

Conflicts:
	C.gitignore

Updates done.

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.

Ada.gitignore

@@ -0,0 +1,5 @@
+# Object file
+*.o
+
+# Ada Library Information
+*.ali

Agda.gitignore

@@ -0,0 +1 @@
+*.agdai

Android.gitignore

@@ -12,19 +12,12 @@
 bin/
 gen/
 
+# Ignore gradle files
+.gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Eclipse project files
-.classpath
-.project
-
 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
-

ArchLinuxPackages.gitignore

@@ -0,0 +1,7 @@
+*.tar
+*.tar.*
+*.log
+*.log.*
+*.sig
+pkg/
+src/

Autotools.gitignore

@@ -11,3 +11,4 @@ Makefile.in
 /depcomp
 /install-sh
 /missing
+/stamp-h1

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

C.gitignore

@@ -1,6 +1,8 @@
 # Object files
 *.o
 *.ko
+*.obj
+*.elf
 
 # Libraries
 *.lib
@@ -18,3 +20,4 @@
 *.app
 *.i*86
 *.x86_64
+*.hex

CONTRIBUTING.md

@@ -1,3 +1,34 @@
-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.
+# Contributing guidelines
 
-This ensures we can efficiently go through pull requests and keep quality high.
+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.

CakePHP.gitignore

@@ -4,4 +4,4 @@ tmp/*
 app/tmp/*
 app/[Cc]onfig/core.php
 app/[Cc]onfig/database.php
-!empty
+!empty

ChefCookbook.gitignore

@@ -0,0 +1,17 @@
+.vagrant
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml

CodeIgniter.gitignore

@@ -3,3 +3,4 @@
 */logs/!index.html
 */cache/*
 */cache/!index.html
+*/cache/!.htaccess

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

Concrete5.gitignore

@@ -1,3 +1,3 @@
 config/site.php
 files/cache/*
-files/tmp/*
+files/tmp/*

Coq.gitignore

@@ -1,4 +1,3 @@
 *.vo
 *.glob
 *.v.d
-

Dart.gitignore

@@ -1,4 +1,16 @@
-.DS_Store
+// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
-packages
+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.

Delphi.gitignore

@@ -1,5 +1,5 @@
 *.dcu
-*.~*~
+*.~*
 *.local
 *.identcache
 __history
@@ -7,4 +7,4 @@ __history
 *.map
 *.exe
 *.dll
-bin/*
+bin/*

Django.gitignore

@@ -1,4 +0,0 @@
-*.log
-*.pot
-*.pyc
-local_settings.py

Drupal.gitignore

@@ -8,7 +8,6 @@ sites/*/files
 sites/*/private
 
 # Ignore default text files
-.htaccess
 robots.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt
@@ -22,6 +21,7 @@ sites/all/modules/README.txt
 sites/all/themes/README.txt
 
 # Ignore everything but the "sites" folder ( for non core developer )
+.htaccess
 web.config
 authorize.php
 cron.php
@@ -34,4 +34,4 @@ xmlrpc.php
 /modules
 /profiles
 /scripts
-/themes
+/themes

EPiServer.gitignore

@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config

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/*

Fancy.gitignore

@@ -0,0 +1,2 @@
+*.rbc
+*.fyc

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
-

ForceDotCom.gitignore

@@ -1,4 +1,4 @@
 .project
 .settings
 salesforce.schema
-Referenced Packages
+Referenced Packages

GWT.gitignore

@@ -14,4 +14,3 @@ gwt-unitCache/
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
-

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

Global/BricxCC.gitignore

@@ -0,0 +1,4 @@
+# Bricx Command Center IDE
+# http://bricxcc.sourceforge.net
+*.bak
+*.sym

Global/CVS.gitignore

@@ -1,4 +1,4 @@
 /CVS/*
 */CVS/*
 .cvsignore
-*/.cvsignore
+*/.cvsignore

Global/Cloud9.gitignore

@@ -0,0 +1,2 @@
+# Cloud9 IDE - http://c9.io
+.c9revisions

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

Global/Emacs.gitignore

@@ -1,8 +1,9 @@
+# -*- mode: gitignore; -*-
 *~
 \#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
-.elc
+*.elc
 auto-save-list
 tramp
 .\#*
@@ -10,3 +11,6 @@ tramp
 # Org-mode
 .org-id-locations
 *_archive
+
+# flymake-mode
+*_flymake.*

Global/Ensime.gitignore

@@ -0,0 +1,3 @@
+# Ensime specific
+.ensime
+.ensime_lucene/

Global/Espresso.gitignore

@@ -1 +1 @@
-*.esproj
+*.esproj

Global/FlexBuilder.gitignore

@@ -1,2 +1,2 @@
 bin/
-bin-debug/
+bin-debug/

Global/IntelliJ.gitignore

@@ -1,4 +0,0 @@
-*.iml
-*.ipr
-*.iws
-.idea/

Global/JetBrains.gitignore

@@ -0,0 +1,23 @@
+# 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/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/

Global/KDevelop4.gitignore

@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/

Global/Kate.gitignore

@@ -0,0 +1,3 @@
+# Swap Files #
+.*.kate-swp
+.swp.*

Global/Linux.gitignore

@@ -1,3 +1 @@
-.*
-!.gitignore
 *~

Global/Matlab.gitignore

@@ -12,5 +12,5 @@
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation	
+# Simulink Code Generation
 slprj/

Global/NotepadPP.gitignore

@@ -0,0 +1,2 @@
+# Notepad++ backups #
+*.bak

Global/OSX.gitignore

@@ -1,8 +1,9 @@
 .DS_Store
 .AppleDouble
 .LSOverride
-Icon
 
+# Icon must ends with two \r.
+Icon
 
 # Thumbnails
 ._*

Global/PhPStorm.gitignore

@@ -1 +0,0 @@
-.idea/

Global/PyCharm.gitignore

@@ -1,4 +0,0 @@
-# PyCharm
-# http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
-.iml

Global/RubyMine.gitignore

@@ -1 +0,0 @@
-.idea/workspace.xml

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

Global/SBT.gitignore

@@ -4,4 +4,6 @@
 target/
 lib_managed/
 src_managed/
-project/boot/
+project/boot/
+.history
+.cache

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

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
+

Global/Vagrant.gitignore

@@ -0,0 +1 @@
+.vagrant/

Global/Windows.gitignore

@@ -7,3 +7,9 @@ Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp

Global/vim.gitignore

@@ -1,4 +1,5 @@
-*.s[a-w][a-z]
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist

Global/webMethods.gitignore

@@ -0,0 +1,15 @@
+**/IntegrationServer/lib/
+**/IntegrationServer/datastore/
+**/IntegrationServer/db/
+**/IntegrationServer/DocumentStore/
+**/IntegrationServer/lib/
+**/IntegrationServer/logs/
+**/IntegrationServer/replicate/
+**/IntegrationServer/sdk/
+**/IntegrationServer/support/
+**/IntegrationServer/update/
+**/IntegrationServer/userFtpRoot/
+**/IntegrationServer/web/
+**/IntegrationServer/WmRepository4/
+**/IntegrationServer/XAStore/
+**/IntegrationServer/packages/Wm*/

Go.gitignore

@@ -20,3 +20,4 @@ _cgo_export.*
 _testmain.go
 
 *.exe
+*.test

Grails.gitignore

@@ -34,11 +34,9 @@
 # older plugin install locations
 /plugins
 /web-app/plugins
-/web-app/WEB-INF/classes
 
 # "temporary" build files
 /target
 
 # other
 *.iws
-

Haskell.gitignore

@@ -5,3 +5,7 @@ cabal-dev
 *.chi
 *.chs.h
 .virthualenv
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+cabal.config

Jboss.gitignore

@@ -13,3 +13,7 @@ jboss/server/minimal/log/*.log
 jboss/server/minimal/tmp/**/*
 jboss/server/minimal/data/**/*
 jboss/server/minimal/work/**/*
+
+# deployed package files #
+
+*.DEPLOYED

Joomla.gitignore

@@ -10,6 +10,7 @@ administrator/components/com_config/*
 administrator/components/com_contact/*
 administrator/components/com_content/*
 administrator/components/com_cpanel/*
+administrator/components/com_finder/*
 administrator/components/com_installer/*
 administrator/components/com_languages/*
 administrator/components/com_login/*
@@ -46,6 +47,8 @@ administrator/language/en-GB/en-GB.com_content.ini
 administrator/language/en-GB/en-GB.com_content.sys.ini
 administrator/language/en-GB/en-GB.com_cpanel.ini
 administrator/language/en-GB/en-GB.com_cpanel.sys.ini
+administrator/language/en-GB/en-GB.com_finder.ini
+administrator/language/en-GB/en-GB.com_finder.sys.ini
 administrator/language/en-GB/en-GB.com_installer.ini
 administrator/language/en-GB/en-GB.com_installer.sys.ini
 administrator/language/en-GB/en-GB.com_languages.ini
@@ -92,6 +95,8 @@ administrator/language/en-GB/en-GB.mod_login.ini
 administrator/language/en-GB/en-GB.mod_login.sys.ini
 administrator/language/en-GB/en-GB.mod_menu.ini
 administrator/language/en-GB/en-GB.mod_menu.sys.ini
+administrator/language/en-GB/en-GB.mod_multilangstatus.ini
+administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
 administrator/language/en-GB/en-GB.mod_online.ini
 administrator/language/en-GB/en-GB.mod_online.sys.ini
 administrator/language/en-GB/en-GB.mod_popular.ini
@@ -108,6 +113,8 @@ administrator/language/en-GB/en-GB.mod_toolbar.ini
 administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
 administrator/language/en-GB/en-GB.mod_unread.ini
 administrator/language/en-GB/en-GB.mod_unread.sys.ini
+administrator/language/en-GB/en-GB.mod_version.ini
+administrator/language/en-GB/en-GB.mod_version.sys.ini
 administrator/language/en-GB/en-GB.plg_authentication_example.ini
 administrator/language/en-GB/en-GB.plg_authentication_example.sys.ini
 administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
@@ -116,6 +123,8 @@ administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
 administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
 administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
 administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
+administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
+administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
 administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
 administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
 administrator/language/en-GB/en-GB.plg_content_geshi.ini
@@ -146,6 +155,8 @@ administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
 administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
 administrator/language/en-GB/en-GB.plg_extension_joomla.ini
 administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
+administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
+administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
 administrator/language/en-GB/en-GB.plg_search_categories.ini
 administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
 administrator/language/en-GB/en-GB.plg_search_contacts.ini
@@ -160,6 +171,8 @@ administrator/language/en-GB/en-GB.plg_system_cache.ini
 administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
 administrator/language/en-GB/en-GB.plg_system_debug.ini
 administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
+administrator/language/en-GB/en-GB.plg_system_highlight.ini
+administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
 administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
 administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
 administrator/language/en-GB/en-GB.plg_system_log.ini
@@ -195,6 +208,7 @@ administrator/modules/mod_latest/*
 administrator/modules/mod_logged/*
 administrator/modules/mod_login/*
 administrator/modules/mod_menu/*
+administrator/modules/mod_multilangstatus/*
 administrator/modules/mod_online/*
 administrator/modules/mod_popular/*
 administrator/modules/mod_quickicon/*
@@ -203,6 +217,7 @@ administrator/modules/mod_submenu/*
 administrator/modules/mod_title/*
 administrator/modules/mod_toolbar/*
 administrator/modules/mod_unread/*
+administrator/modules/mod_version/*
 administrator/modules/index.html
 administrator/templates/bluestork/*
 administrator/templates/hathor/*
@@ -210,9 +225,11 @@ administrator/templates/system/*
 administrator/templates/index.html
 administrator/index.php
 cache/*
+cli/*
 components/com_banners/*
 components/com_contact/*
 components/com_content/*
+components/com_finder/*
 components/com_mailto/*
 components/com_media/*
 components/com_newsfeeds/*
@@ -296,20 +313,31 @@ language/en-GB/en-GB.tpl_beez5.ini
 language/en-GB/en-GB.tpl_beez5.sys.ini
 language/en-GB/en-GB.xml
 language/en-GB/index.html
+language/en-GB/install.xml
 language/overrides/*
 language/index.html
+libraries/cms.php
+libraries/cms/*
 libraries/joomla/*
 libraries/phpmailer/*
 libraries/phputf8/*
 libraries/simplepie/*
 libraries/index.html
+libraries/import.php
 libraries/loader.php
+libraries/platform.php
 logs/*
+media/cms/*
+media/com_finder/*
 media/contacts/*
 media/editors/*
 media/mailto/*
 media/media/*
 media/mod_languages/*
+media/overrider/*
+media/plg_quickicon_extensionupdate/*
+media/plg_quickicon_joomlaupdate/*
+media/plg_system_highlight/*
 media/system/*
 media/index.html
 modules/mod_articles_archive/*
@@ -322,6 +350,7 @@ modules/mod_banners/*
 modules/mod_breadcrumbs/*
 modules/mod_custom/*
 modules/mod_feed/*
+modules/mod_finder/*
 modules/mod_footer/*
 modules/mod_languages/*
 modules/mod_login/*
@@ -341,8 +370,10 @@ plugins/authentication/gmail/*
 plugins/authentication/joomla/*
 plugins/authentication/ldap/*
 plugins/authentication/index.html
+plugins/captcha/recaptcha/*
 plugins/content/emailcloak/*
 plugins/content/example/*
+plugins/content/finder/*
 plugins/content/geshi/*
 plugins/content/joomla/*
 plugins/content/loadmodule/*
@@ -362,6 +393,14 @@ plugins/editors-xtd/index.html
 plugins/extension/example/*
 plugins/extension/joomla/*
 plugins/extension/index.html
+plugins/finder/index.html
+plugins/finder/categories/*
+plugins/finder/contacts/*
+plugins/finder/content/*
+plugins/finder/newsfeeds/*
+plugins/finder/weblinks/*
+plugins/quickicon/extensionupdate/*
+plugins/quickicon/joomlaupdate/*
 plugins/search/categories/*
 plugins/search/contacts/*
 plugins/search/content/*
@@ -370,6 +409,8 @@ plugins/search/weblinks/*
 plugins/search/index.html
 plugins/system/cache/*
 plugins/system/debug/*
+plugins/system/highlight/*
+plugins/system/languagecode/*
 plugins/system/languagefilter/*
 plugins/system/log/*
 plugins/system/logout/*
@@ -393,4 +434,4 @@ tmp/*
 configuration.php
 index.php
 joomla.xml
-*.txt
+*.txt

Kohana.gitignore

@@ -1,2 +1,2 @@
 application/cache/*
-application/logs/*
+application/logs/*

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

Leiningen.gitignore

@@ -2,5 +2,7 @@ pom.xml
 *jar
 /lib/
 /classes/
-/targets/
+/target/
 .lein-deps-sum
+.lein-repl-history
+.lein-plugins/

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

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
@@ -33,6 +37,7 @@ app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional
 app/etc/local.xml.template
+app/etc/local.xml
 app/.htaccess
 app/locale/
 app/Mage.php
@@ -45,7 +50,7 @@ get.php
 includes/
 index.php
 index.php.sample
-install.php
+/install.php
 js/blank.html
 js/calendar/
 js/enterprise/
@@ -78,10 +83,13 @@ LICENSE.txt
 LICENSE_EE*
 mage
 media/customer/
+media/dhl/
 media/downloadable/
 media/.htaccess
 media/import/
 media/xmlconnect/
+media/catalog/product/cache/
+
 nbproject/
 pear
 pear/

Maven.gitignore

@@ -1 +1,2 @@
 target/
+ *.releaseBackup

Meteor.gitignore

@@ -0,0 +1,2 @@
+.meteor/local
+.meteor/meteorite

Node.gitignore

@@ -11,5 +11,4 @@ pids
 logs
 results
 
-npm-debug.log
+node_modules
-node_modules

Objective-C.gitignore

@@ -1,6 +1,8 @@
-# Xcode
+# OS X
 .DS_Store
-*/build/*
+
+# Xcode
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,12 +12,12 @@
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+*.xccheckout
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
 *.xccheckout
 
-#CocoaPods
+# CocoaPods
 Pods

Perl.gitignore

@@ -1,5 +1,5 @@
-blib/
+/blib/
-.build/
+/.build/
 _build/
 cover_db/
 inc/
@@ -7,10 +7,13 @@ Build
 !Build/
 Build.bat
 .last_cover_stats
-Makefile
+/Makefile
-Makefile.old
+/Makefile.old
-MANIFEST.bak
+/MANIFEST.bak
-META.yml
+/META.yml
-MYMETA.yml
+/META.json
+/MYMETA.*
 nytprof.out
-pm_to_blib
+/pm_to_blib
+*.o
+*.bs

PlayFramework.gitignore

@@ -1,10 +1,5 @@
-# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
-# Ignore all dotfiles...
-.*
-# except for .gitignore
-!.gitignore
-
 # Ignore Play! working directory #
+bin
 db
 eclipse
 lib

Plone.gitignore

@@ -1,4 +1,3 @@
-*~
 *.pyc
 *.pyo
 *.tmp*
@@ -7,17 +6,7 @@
 *.EGG
 *.egg-info
 *.EGG-INFO
-*.kpf
-*.swp
-*.wpr
 .*.cfg
-.installed.cfg
-.mr.developer.cfg
-.hg/
-.bzr/
-.svn/
-.project
-.pydevproject
 bin/
 build/
 develop-eggs/
@@ -27,8 +16,3 @@ fake-eggs/
 parts/
 dist/
 var/
-
-
-
-# OSX
-.DS_Store

Prestashop.gitignore

@@ -0,0 +1,29 @@
+# Directories content
+cache/class_index.php
+cache/smarty/cache/*
+!cache/smarty/cache/index.php
+cache/smarty/compile/*
+!cache/smarty/compile/index.php
+cache/tcpdf/*
+!cache/tcpdf/index.php
+
+config/xml/*.xml
+config/settings.inc.php
+
+log/*.log
+
+img/*
+!img/index.php
+!img/*/index.php
+
+tools/smarty*/cache/*.php
+!tools/smarty*/cache/index.php
+tools/smarty*/compile/*.php
+!tools/smarty*/compile/index.php
+
+themes/default/cache/*.js
+themes/default/cache/*.css
+
+# Ignore files on root directory
+robots.txt
+sitemap.xml

Processing.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+applet
+application.linux32
+application.linux64
+application.windows32
+application.windows64
+application.macosx

Python.gitignore

@@ -1,31 +1,35 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
 
 # C extensions
 *.so
 
-# Packages
+# Distribution / packaging
-*.egg
+bin/
-*.egg-info
+build/
-dist
+develop-eggs/
-build
+dist/
-eggs
+eggs/
-parts
+lib/
-bin
+lib64/
-var
+parts/
-sdist
+sdist/
-develop-eggs
+var/
+*.egg-info/
 .installed.cfg
-lib
+*.egg
-lib64
-__pycache__
 
 # Installer logs
 pip-log.txt
+pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+.tox/
 .coverage
-.tox
+.cache
 nosetests.xml
+coverage.xml
 
 # Translations
 *.mo
@@ -34,3 +38,11 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
+

Qt.gitignore

@@ -16,5 +16,10 @@
 *.pro.user.*
 moc_*.cpp
 qrc_*.cpp
-Makefile
+ui_*.h
+Makefile*
 *-build-*
+
+# QtCreator
+
+*.autosave

R.gitignore

@@ -2,4 +2,4 @@
 .Rhistory
 
 # Example code in package build process
-*-Ex.R
+*-Ex.R

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
+This is GitHub’s collection of [`.gitignore`][man] file templates.
-by [forking][fk] and sending a [pull request][pr].
+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
+For more information about how `.gitignore` files work, and how to use them,
-make merging easier for everyone.
+the following resources are a great place to start:
 
-Global gitignores (OS-specific, editor-specific) should go into the
+- The [Ignoring Files chapter][chapter] of the [Pro Git][progit] book.
-`Global/` directory.
+- 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/
+## 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.
+
+- **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.
+
+## Contributing workflow
+
+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/
-[g5]: http://man.cx/gitignore
 
-## Pull Requests
+## License
 
-Since this repo includes a large and diverse
+[MIT](./LICENSE).
-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.
-
-This ensures we can efficiently go through pull requests
-and keep quality high.
-
-## Global Ignores
-
-git has a global configuration that applies rules to all of
-your projects. For example:
-
-    git config --global core.excludesfile ~/.global_ignore
-
-... will apply the rules in ~/.global_ignore for all of your repos.
-
-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.

ROS.gitignore

@@ -0,0 +1,52 @@
+~$
+.swp$
+build/
+bin/
+lib/
+msg_gen/
+srv_gen/
+msg/.*Action\.msg$
+msg/.*ActionFeedback\.msg$
+msg/.*ActionGoal\.msg$
+msg/.*ActionResult\.msg$
+msg/.*Feedback\.msg$
+msg/.*Goal\.msg$
+msg/.*Result\.msg$
+msg/_.*\.py$
+
+\.pcd$
+.pyc$
+
+# Generated by dynamic reconfigure
+\.cfgc$
+/cfg/cpp/
+/cfg/.*\.py$
+
+# Ignore generated docs
+.dox$
+.wikidoc$
+
+# eclipse stuff
+.project
+.cproject
+
+# qcreator stuff
+CMakeLists.txt.user
+
+srv/_.*\.py$
+\.pcd$
+.pyc$
+qtcreator-*
+*.user
+
+/planning/cfg
+/planning/docs
+/planning/src
+
+*~$
+
+# Emacs
+.#*
+
+# Catkin custom files
+CATKIN_IGNORE

Rails.gitignore

@@ -3,17 +3,23 @@
 .sass-cache
 capybara-*.html
 .rspec
-.rvmrc
+/log
-/.bundle
+/tmp
-/vendor/bundle
-/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

Ruby.gitignore

@@ -1,18 +1,29 @@
 *.gem
 *.rbc
-.bundle
+/.config
-.config
+/coverage/
-coverage
+/InstalledFiles
-InstalledFiles
+/pkg/
-lib/bundler/man
+/spec/reports/
-pkg
+/test/tmp/
-rdoc
+/test/version_tmp/
-spec/reports
+/tmp/
-test/tmp
-test/version_tmp
-tmp
 
-# YARD artifacts
+## Documentation cache and generated files:
-.yardoc
+/.yardoc/
-_yardoc
+/_yardoc/
-doc/
+/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

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/

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

Sdcc.gitignore

@@ -6,4 +6,3 @@
 *.rel
 *.rst
 *.sym
-

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/*

Symfony2.gitignore

@@ -11,3 +11,6 @@ web/bundles/*
 # Configuration files
 app/config/parameters.ini
 app/config/parameters.yml
+
+# Composer
+composer.phar

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

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/
+/typo3
-/t3lib/
+/t3lib
 # Ignore temp directory.
 /typo3temp/

Unity.gitignore

@@ -3,6 +3,8 @@
 [Oo]bj/
 
 # Autogenerated VS/MD solution and project files
-*.csproj
+/*.csproj
-*.unityproj
+/*.unityproj
-*.sln
+/*.sln
+/*.suo
+/*.user

VVVV.gitignore

@@ -0,0 +1,7 @@
+
+# .v4p backup files
+*~.xml
+
+# Dynamic plugins .dll
+bin/
+

VisualStudio.gitignore

@@ -7,11 +7,12 @@
 *.sln.docstates
 
 # Build results
-
 [Dd]ebug/
+[Dd]ebugPublic/
 [Rr]elease/
 x64/
 build/
+bld/
 [Bb]in/
 [Oo]bj/
 
@@ -22,8 +23,13 @@ build/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
 *_i.c
 *_p.c
+*_i.h
 *.ilk
 *.meta
 *.obj
@@ -43,9 +49,12 @@ build/
 *.vssscc
 .builds
 *.pidb
-*.log
+*.svclog
 *.scc
 
+# Chutzpah Test files
+_Chutzpah*
+
 # Visual C++ cache files
 ipch/
 *.aps
@@ -59,12 +68,19 @@ ipch/
 *.vsp
 *.vspx
 
+# TFS 2012 Local Workspace
+$tf/
+
 # Guidance Automation Toolkit
 *.gpState
 
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
 
 # TeamCity is a build add-in
 _TeamCity*
@@ -74,8 +90,13 @@ _TeamCity*
 
 # NCrunch
 *.ncrunch*
+_NCrunch_*
 .*crunch*.local.xml
 
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
 # Installshield output folder
 [Ee]xpress/
 
@@ -94,14 +115,16 @@ publish/
 
 # Publish Web Output
 *.Publish.xml
-*.pubxml
+*.azurePubxml
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 #packages/
+## TODO: If the tool you use requires repositories.config, also uncomment the next line
+#!packages/repositories.config
 
 # Windows Azure Build Output
-csx
+csx/
 *.build.csdef
 
 # Windows Store app package directory
@@ -115,6 +138,7 @@ ClientBin/
 ~$*
 *~
 *.dbmdl
+*.dbproj.schemaview
 *.[Pp]ublish.xml
 *.pfx
 *.publishsettings
@@ -133,6 +157,14 @@ UpgradeLog*.htm
 App_Data/*.mdf
 App_Data/*.ldf
 
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
 # =========================
 # Windows detritus
 # =========================
@@ -146,6 +178,3 @@ Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
-
-# Mac crap
-.DS_Store

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

Yeoman.gitignore

@@ -0,0 +1,6 @@
+node_modules/
+bower_components/
+*.log
+
+build/
+dist/

Yii.gitignore

@@ -1,3 +1,6 @@
-assets/
+assets/*
-protected/runtime/
+!assets/.gitignore
-themes/classic/views/
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/

ZendFramework.gitignore

@@ -3,4 +3,3 @@ LICENSE.txt
 README.txt
 demos/
 extras/documentation
-

nanoc.gitignore

@@ -5,3 +5,6 @@ output/
 
 # Temporary file directory
 tmp/
+
+# Crash Log
+crash.log

stella.gitignore

@@ -0,0 +1,12 @@
+# Atari 2600 (Stella) support for multiple assemblers
+# - DASM
+# - CC65
+
+# Assembled binaries and object directories
+obj/
+a.out
+*.bin
+*.a26
+
+# Add in special Atari 7800-based binaries for good measure
+*.a78