Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node-patch

Conflicts:
	Node.gitignore
This commit is contained in:
Adam Roben 2014-02-28 11:36:57 -05:00
commit c096a6566a
29 changed files with 141 additions and 66 deletions

View File

@ -1,18 +1,18 @@
# built application files
# Built application files
*.apk
*.ap_
# files for the dex VM
# Files for the Dalvik VM
*.dex
# Java class files
*.class
# generated files
# Generated files
bin/
gen/
# Ignore gradle files
# Gradle files
.gradle/
build/

5
DM.gitignore Normal file
View File

@ -0,0 +1,5 @@
*.dmb
*.rsc
*.int
*.lk
*.zip

View File

@ -5,7 +5,7 @@ packages/
*.js.map
// Include when developing application packages
pubspec.lock
pubspec.lock
// Avoid committing generated JavaScript files
*.dart.js

View File

@ -1,14 +1,52 @@
*.dcu
*.~*
*.local
*.identcache
__history
*.drc
*.map
# Uncomment these types if you want even more clean repository. But be careful.
# It can make harm to an existing project source. Read explanations below.
#
# Resource files are binaries containing manifest, project icon and version info.
# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files.
#*.res
#
# Type library file (binary). In old Delphi versions it should be stored.
# Since Delphi 2009 it is produced from .ridl file and can safely be ignored.
#*.tlb
#
# Diagram Portfolio file. Used by the diagram editor up to Delphi 7.
# Uncomment this if you are not using diagrams or use newer Delphi version.
#*.ddp
#
# Visual LiveBindings file. Added in Delphi XE2.
# Uncomment this if you are not using LiveBindings Designer.
#*.vlb
#
# Deployment Manager configuration file for your project. Added in Delphi XE2.
# Uncomment this if it is not mobile development and you do not use remote debug feature.
#*.deployproj
#
# Delphi compiler-generated binaries (safe to delete)
*.exe
*.dll
*.bpl
*.bpi
*.dcp
*.so
*.apk
bin/*
*.drc
*.map
*.dres
*.rsm
*.tds
# Delphi autogenerated files (duplicated info)
*.cfg
*Resource.rc
# Delphi local files (user-specific info)
*.local
*.identcache
*.projdata
*.tvsconfig
*.dsk
# Delphi history and backups
__history/
*.~*

View File

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

View File

@ -23,5 +23,8 @@ local.properties
# PDT-specific
.buildpath
# sbteclipse plugin
.target
# TeXlipse plugin
.texlipse

View File

@ -0,0 +1,2 @@
# The compilation directoy
EIFGENs

View File

@ -21,3 +21,9 @@ out/
# generated by mpeltonen/sbt-idea plugin
.idea_modules/
# generated by JIRA plugin
atlassian-ide-plugin.xml
# generated by Crashlytics plugin (for Android Studio and Intellij)
com_crashlytics_export_strings.xml

View File

@ -1 +1,4 @@
*~
# KDE directory preferences
.directory

View File

@ -1,2 +0,0 @@
### Sass Ignores - "Sassy CSS" http://sass-lang.com/
*.sass-cache

View File

@ -1,17 +1,7 @@
# .gitignore for Grails 1.2 and 1.3
# web application files
/web-app/WEB-INF
# IDE support files
/.classpath
/.launch
/.project
/.settings
/*.launch
/*.tmproj
/ivy*
/eclipse
/web-app/WEB-INF/classes
# default HSQL database files for production mode
/prodDb.*
@ -38,6 +28,3 @@
# "temporary" build files
/target
# other
*.iws

View File

@ -4,7 +4,7 @@ cabal-dev
*.hi
*.chi
*.chs.h
.virthualenv
.virtualenv
.hsenv
.cabal-sandbox/
cabal.sandbox.config

2
Idris.gitignore Normal file
View File

@ -0,0 +1,2 @@
*.ibc
*.o

View File

@ -16,9 +16,6 @@ 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.*
@ -27,6 +24,11 @@ bld/
*.VisualState.xml
TestResult.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
*_i.c
*_p.c
*_i.h
@ -97,6 +99,9 @@ _NCrunch_*
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
@ -118,11 +123,14 @@ publish/
*.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/*
## TODO: If the tool you use requires repositories.config uncomment the next line
#!packages/repositories.config
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
!packages/build/
# Windows Azure Build Output
csx/
*.build.csdef
@ -141,6 +149,7 @@ ClientBin/
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
# RIA/Silverlight projects
Generated_Code/
@ -153,8 +162,8 @@ UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
*.mdf
*.ldf
# Business Intelligence projects
*.rdl.data

View File

@ -7,3 +7,6 @@
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

View File

@ -1,4 +1,4 @@
Copyright (c) 2013 GitHub, Inc.
Copyright (c) 2014 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 File

@ -1,8 +1,11 @@
pom.xml
pom.xml.asc
*jar
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures

View File

@ -1,6 +1,7 @@
.modgit/
app/code/community/Find/
app/code/community/Phoenix/
app/code/community/Cm/
app/code/core/
app/design/adminhtml/default/default/
app/design/adminhtml/default/find/
@ -33,6 +34,8 @@ app/etc/modules/Mage_Weee.xml
app/etc/modules/Mage_Widget.xml
app/etc/modules/Mage_XmlConnect.xml
app/etc/modules/Phoenix_Moneybookers.xml
app/etc/modules/Cm_RedisSession.xml
app/etc/applied.patches.list
app/etc/config.xml
app/etc/enterprise.xml
app/etc/local.xml.additional
@ -77,6 +80,9 @@ lib/PEAR/
lib/phpseclib/
lib/Varien/
lib/Zend/
lib/Cm/
lib/Credis/
lib/Magento/
LICENSE_AFL.txt
LICENSE.html
LICENSE.txt
@ -89,7 +95,7 @@ media/.htaccess
media/import/
media/xmlconnect/
media/catalog/product/cache/
api.php
nbproject/
pear
pear/

View File

@ -15,3 +15,5 @@ test-result
server.pid
*.iml
*.eml
dist
.cache

View File

@ -6,6 +6,8 @@ __pycache__/
*.so
# Distribution / packaging
.Python
env/
bin/
build/
develop-eggs/

View File

@ -1,6 +1,4 @@
*.rbc
*.sassc
.sass-cache
capybara-*.html
.rspec
/log

2
SCons.gitignore Normal file
View File

@ -0,0 +1,2 @@
# for projects that use SCons for building: http://http://www.scons.org/
.sconsign.dblite

View File

@ -1,33 +1,25 @@
## SugarCRM
# Ignore custom .htaccess stuff.
/.htaccess
# Ignore large parts of the annoying cache directory without breaking things.
cache/csv/*
cache/dashlets/*
cache/diagnostic/*
cache/dynamic_fields/*
cache/feeds/*
cache/import/*
cache/include/*
cache/jsLanguage/*
cache/modules/*
!cache/modules/emails
!cache/modules/Emails
cache/pdf/*
cache/smarty/cache/*
cache/smarty/templates_c/*
cache/themes/*
cache/xml/*
# Ignore the cache directory completely.
# This will break the current behaviour. Which was often leading to
# the misuse of the repository as backup replacement.
# For development the cache directory can be safely ignored and
# therefore it is ignored.
/cache/
# Ignore some files and directories from the custom directory.
custom/history/*
custom/modulebuilder/*
custom/working/*
custom/modules/*/Ext/
custom/application/Ext/*
/custom/history/
/custom/modulebuilder/
/custom/working/
/custom/modules/*/Ext/
/custom/application/Ext/
# Custom configuration should also be ignored.
/config.php
/config_override.php
# The silent upgrade scripts aren't needed.
silentUpgrade*.php
/silentUpgrade*.php
# Logs files can safely be ignored.
*.log
# Ignore the new upload directories.
/upload/
/upload_backup/

View File

@ -25,6 +25,7 @@
## Build tool auxiliary files:
*.fdb_latexmk
*.synctex.gz
*.synctex.gz(busy)
*.pdfsync
## Auxiliary and intermediate files from other packages:

9
Umbraco.gitignore Normal file
View File

@ -0,0 +1,9 @@
# Ignore Umbraco folders (Generated folders created by Umbraco)
ClientDependency/
TEMP/
Logs/
Cached/
ExamineIndexes/
# Ignore Umbraco content cache file
umbraco.config

View File

@ -8,4 +8,6 @@
/*.sln
/*.suo
/*.user
/*.userprefs
/*.pidb
/*.booproj

View File

@ -10,3 +10,4 @@ sitemap.xml
wp-content/cache/
wp-content/backups/
sitemap.xml.gz
wp-config.php

View File

@ -1,4 +1,4 @@
# For projects using nanoc (http://nanoc.stoneship.org/)
# For projects using nanoc (http://nanoc.ws/)
# Default location for output, needs to match output_dir's value found in config.yaml
output/