Merge branch 'master' into patch-1

Conflicts:
	Objective-C.gitignore
This commit is contained in:
Michael Gerbush 2013-11-07 13:04:32 -06:00
commit 95075cccba
62 changed files with 277 additions and 95 deletions

View File

@ -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 File

@ -27,4 +27,3 @@ proguard/
*.ipr
*.iws
.idea/

View File

@ -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 File

@ -1,5 +1,7 @@
# Object files
*.o
*.ko
*.obj
# Libraries
*.lib

34
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,34 @@
# Contributing guidelines
Wed 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 projects homepage**. Unless its
extremely popular, theres a chance the maintainers dont know about or use
the language, framework, editor, app, or project your change applies to.
- **Provide links to documentation** supporting the change youre making.
Current, canonical documentation mentioning the files being ignored is best.
If documentation isnt available to support your change, do the best you can
to explain what the files being ignored are for.
- **Explain why youre 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.
Its 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 youre making,
the more likely well be to accept your contribution quickly.
Please also understand that we cant 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, its not because its not awesome.

View File

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

View File

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

View File

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

View File

@ -7,4 +7,4 @@ __history
*.map
*.exe
*.dll
bin/*
bin/*

View File

@ -34,4 +34,4 @@ xmlrpc.php
/modules
/profiles
/scripts
/themes
/themes

4
EPiServer.gitignore Normal file
View File

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

View File

@ -12,4 +12,4 @@ images/pm_attachments/
sized/
thumbs/
_thumbs/
*/expressionengine/cache/*
*/expressionengine/cache/*

2
Fancy.gitignore Normal file
View File

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

View File

@ -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 File

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

View File

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

View File

@ -9,6 +9,7 @@
*.bz2
*.xz
*.lzma
*.cab
#packing-only formats
*.iso
@ -21,3 +22,6 @@
*.egg
*.deb
*.rpm
*.msi
*.msm
*.msp

View File

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

View File

@ -1,6 +1,7 @@
*.pydevproject
.project
.metadata
.gradle
bin/**
tmp/**
tmp/**/*
@ -24,3 +25,6 @@ local.properties
# PDT-specific
.buildpath
# TeXlipse plugin
.texlipse

View File

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

View File

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

View File

@ -2,3 +2,4 @@
*.ipr
*.iws
.idea/
out/

View File

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

View File

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

View File

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

View File

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

View File

@ -1 +1 @@
.idea/
.idea/

View File

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

View File

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

View File

@ -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

1
Global/Vagrant.gitignore Normal file
View File

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

View File

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

View File

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

View File

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

View File

@ -41,4 +41,3 @@
# other
*.iws

View File

@ -393,4 +393,4 @@ tmp/*
configuration.php
index.php
joomla.xml
*.txt
*.txt

View File

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

View File

@ -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 File

@ -3,9 +3,14 @@
*.alg
*.aux
*.bbl
*.bcf
*.blg
*-blx.aux
*-blx.bib
*.brf
*.dvi
*.fdb_latexmk
*.fls
*.glg
*.glo
*.gls
@ -13,7 +18,9 @@
*.ilg
*.ind
*.ist
*.loa
*.lof
*.lol
*.log
*.lot
*.maf
@ -24,8 +31,10 @@
*.out
*.pdfsync
*.ps
*.run.xml
*.snm
*.synctex.gz
*.thm
*.toc
*.vrb
*.xdy

View File

@ -4,3 +4,4 @@ pom.xml
/classes/
/targets/
.lein-deps-sum
.lein-plugins/

View File

@ -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 File

@ -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 File

@ -12,4 +12,4 @@ logs
results
npm-debug.log
node_modules
node_modules

View File

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

View File

@ -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 File

@ -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

7
Processing.gitignore Normal file
View File

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

View File

@ -1,3 +1,4 @@
# Byte-compiled / optimized / DLL files
*.py[cod]
# C extensions

View File

@ -16,5 +16,6 @@
*.pro.user.*
moc_*.cpp
qrc_*.cpp
Makefile
ui_*.h
Makefile*
*-build-*

View File

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

104
README.md
View File

@ -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 GitHubs 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/
## 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
Wed 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 projects homepage**. Unless its
extremely popular, theres a chance the maintainers dont know about or use
the language, framework, editor, app, or project your change applies to.
- **Provide links to documentation** supporting the change youre making.
Current, canonical documentation mentioning the files being ignored is best.
If documentation isnt available to support your change, do the best you can
to explain what the files being ignored are for.
- **Explain why youre 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.
Its 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 youre making,
the more likely well be to accept your contribution quickly.
Please also understand that we cant 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, its not because its not awesome.
## Contributing workflow
Heres 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 forks 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
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.
[MIT](./LICENSE).

View File

@ -6,13 +6,13 @@ capybara-*.html
.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

20
RubyMotion.gitignore Normal file
View File

@ -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 File

@ -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 File

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

View File

@ -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 File

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

View File

@ -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 File

@ -15,12 +15,16 @@ build/
[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.*
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
@ -40,7 +44,7 @@ build/
*.vssscc
.builds
*.pidb
*.log
*.svclog
*.scc
# Visual C++ cache files
@ -56,12 +60,16 @@ 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
# TeamCity is a build add-in
_TeamCity*
@ -71,6 +79,7 @@ _TeamCity*
# NCrunch
*.ncrunch*
_NCrunch_*
.*crunch*.local.xml
# Installshield output folder
@ -91,7 +100,6 @@ publish/
# Publish Web Output
*.Publish.xml
*.pubxml
# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
@ -112,6 +120,7 @@ ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.[Pp]ublish.xml
*.pfx
*.publishsettings
@ -130,6 +139,14 @@ UpgradeLog*.htm
App_Data/*.mdf
App_Data/*.ldf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
# Microsoft Fakes
FakesAssemblies/
# =========================
# Windows detritus
# =========================

View File

@ -10,4 +10,4 @@ sitemap.xml
*.log
wp-content/cache/
wp-content/backups/
sitemap.xml.gz
sitemap.xml.gz

View File

@ -1,3 +1,3 @@
assets/
protected/runtime/
themes/classic/views/
themes/classic/views/

View File

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