diff options
| author | Michael Gerbush <michaelg@spiceworks.com> | 2013-11-07 13:04:32 -0600 |
|---|---|---|
| committer | Michael Gerbush <michaelg@spiceworks.com> | 2013-11-07 13:04:32 -0600 |
| commit | 95075cccba0e117228071667d908df497936b3fe (patch) | |
| tree | cb755766987970fd52de92236729cd6a5dc4b829 | |
| parent | 182aeb220dc2ebffc4e22936b19deb50b071d4a2 (diff) | |
| parent | 7bbc288b527710d20cc68d7c114ddb8392f97d62 (diff) | |
| download | gitignore-95075cccba0e117228071667d908df497936b3fe.tar.gz gitignore-95075cccba0e117228071667d908df497936b3fe.zip | |
Merge branch 'master' into patch-1
Conflicts:
Objective-C.gitignore
62 files changed, 272 insertions, 90 deletions
diff --git a/Actionscript.gitignore b/Actionscript.gitignore index fa65f0bd..f112f7fb 100644 --- a/Actionscript.gitignore +++ b/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.
\ No newline at end of file +# information for Eclipse / Flash Builder. diff --git a/Android.gitignore b/Android.gitignore index 87a44e0e..648a292a 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -27,4 +27,3 @@ proguard/ *.ipr *.iws .idea/ - diff --git a/C++.gitignore b/C++.gitignore index 620d3dc8..0def2755 100644 --- a/C++.gitignore +++ b/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 diff --git a/C.gitignore b/C.gitignore index 0331bbbd..13d11603 100644 --- a/C.gitignore +++ b/C.gitignore @@ -1,5 +1,7 @@ # Object files *.o +*.ko +*.obj # Libraries *.lib diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..91543ab4 --- /dev/null +++ b/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. diff --git a/CakePHP.gitignore b/CakePHP.gitignore index 61d34467..bd743c4d 100644 --- a/CakePHP.gitignore +++ b/CakePHP.gitignore @@ -4,4 +4,4 @@ tmp/* app/tmp/* app/[Cc]onfig/core.php app/[Cc]onfig/database.php -!empty
\ No newline at end of file +!empty diff --git a/Concrete5.gitignore b/Concrete5.gitignore index cfe1cabd..9aa215ad 100644 --- a/Concrete5.gitignore +++ b/Concrete5.gitignore @@ -1,3 +1,3 @@ config/site.php files/cache/* -files/tmp/*
\ No newline at end of file +files/tmp/* diff --git a/Coq.gitignore b/Coq.gitignore index 769bc36c..d3083b3a 100644 --- a/Coq.gitignore +++ b/Coq.gitignore @@ -1,4 +1,3 @@ *.vo *.glob *.v.d - diff --git a/Delphi.gitignore b/Delphi.gitignore index 38b6bd0c..ff61420c 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -7,4 +7,4 @@ __history *.map *.exe *.dll -bin/*
\ No newline at end of file +bin/* diff --git a/Drupal.gitignore b/Drupal.gitignore index 73677d29..0a6c20bd 100644 --- a/Drupal.gitignore +++ b/Drupal.gitignore @@ -34,4 +34,4 @@ xmlrpc.php /modules /profiles /scripts -/themes
\ No newline at end of file +/themes diff --git a/EPiServer.gitignore b/EPiServer.gitignore new file mode 100644 index 00000000..ca7a7862 --- /dev/null +++ b/EPiServer.gitignore @@ -0,0 +1,4 @@ +###################### +## EPiServer Files +###################### +*License.config
\ No newline at end of file diff --git a/ExpressionEngine.gitignore b/ExpressionEngine.gitignore index c56e7abc..75c9aa49 100644 --- a/ExpressionEngine.gitignore +++ b/ExpressionEngine.gitignore @@ -12,4 +12,4 @@ images/pm_attachments/ sized/ thumbs/ _thumbs/ -*/expressionengine/cache/*
\ No newline at end of file +*/expressionengine/cache/* diff --git a/Fancy.gitignore b/Fancy.gitignore new file mode 100644 index 00000000..6b345074 --- /dev/null +++ b/Fancy.gitignore @@ -0,0 +1,2 @@ +*.rbc +*.fyc
\ No newline at end of file diff --git a/Finale.gitignore b/Finale.gitignore index c8ac293b..7ef08e0c 100644 --- a/Finale.gitignore +++ b/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 - diff --git a/ForceDotCom.gitignore b/ForceDotCom.gitignore index ee95ec3d..3933cd4d 100644 --- a/ForceDotCom.gitignore +++ b/ForceDotCom.gitignore @@ -1,4 +1,4 @@ .project .settings salesforce.schema -Referenced Packages
\ No newline at end of file +Referenced Packages diff --git a/GWT.gitignore b/GWT.gitignore index 63e3e9c5..c558713f 100644 --- a/GWT.gitignore +++ b/GWT.gitignore @@ -14,4 +14,3 @@ gwt-unitCache/ # more caches and things from deploy # war/WEB-INF/deploy/ war/WEB-INF/classes/ - diff --git a/Global/Archives.gitignore b/Global/Archives.gitignore index 82d3b10f..e9eda68b 100644 --- a/Global/Archives.gitignore +++ b/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 diff --git a/Global/CVS.gitignore b/Global/CVS.gitignore index 0f0f06ed..01ba8634 100644 --- a/Global/CVS.gitignore +++ b/Global/CVS.gitignore @@ -1,4 +1,4 @@ /CVS/* */CVS/* .cvsignore -*/.cvsignore
\ No newline at end of file +*/.cvsignore diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index 7b3ad03c..f3587944 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -1,6 +1,7 @@ *.pydevproject .project .metadata +.gradle bin/** tmp/** tmp/**/* @@ -24,3 +25,6 @@ local.properties # PDT-specific .buildpath + +# TeXlipse plugin +.texlipse diff --git a/Global/Espresso.gitignore b/Global/Espresso.gitignore index 1aaec9c4..1234530b 100644 --- a/Global/Espresso.gitignore +++ b/Global/Espresso.gitignore @@ -1 +1 @@ -*.esproj
\ No newline at end of file +*.esproj diff --git a/Global/FlexBuilder.gitignore b/Global/FlexBuilder.gitignore index 86543949..b6ce3f1e 100644 --- a/Global/FlexBuilder.gitignore +++ b/Global/FlexBuilder.gitignore @@ -1,2 +1,2 @@ bin/ -bin-debug/
\ No newline at end of file +bin-debug/ diff --git a/Global/IntelliJ.gitignore b/Global/IntelliJ.gitignore index 7d89b9c0..7576fded 100644 --- a/Global/IntelliJ.gitignore +++ b/Global/IntelliJ.gitignore @@ -2,3 +2,4 @@ *.ipr *.iws .idea/ +out/ diff --git a/Global/KDevelop4.gitignore b/Global/KDevelop4.gitignore new file mode 100644 index 00000000..7ac57b1a --- /dev/null +++ b/Global/KDevelop4.gitignore @@ -0,0 +1,2 @@ +*.kdev4 +.kdev4/ diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore index 151e2997..b25c15b8 100644 --- a/Global/Linux.gitignore +++ b/Global/Linux.gitignore @@ -1,3 +1 @@ -.* -!.gitignore *~ diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore index f52813b6..79bc56cd 100644 --- a/Global/Matlab.gitignore +++ b/Global/Matlab.gitignore @@ -12,5 +12,5 @@ # Compiled MEX binaries (all platforms) *.mex* -# Simulink Code Generation +# Simulink Code Generation slprj/ diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index cf8db5d9..65b94232 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -1,8 +1,9 @@ .DS_Store .AppleDouble .LSOverride -Icon +# Icon must ends with two \r. +Icon
# Thumbnails ._* diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore index 62c89355..9f11b755 100644 --- a/Global/PhPStorm.gitignore +++ b/Global/PhPStorm.gitignore @@ -1 +1 @@ -.idea/
\ No newline at end of file +.idea/ diff --git a/Global/SASS.gitignore b/Global/SASS.gitignore index 2c306072..c1df001e 100644 --- a/Global/SASS.gitignore +++ b/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 diff --git a/Global/SBT.gitignore b/Global/SBT.gitignore index 3dfc9d7c..1f4d73bc 100644 --- a/Global/SBT.gitignore +++ b/Global/SBT.gitignore @@ -4,4 +4,6 @@ target/ lib_managed/ src_managed/ -project/boot/
\ No newline at end of file +project/boot/ +.history +.cache diff --git a/Global/Tags.gitignore b/Global/Tags.gitignore index cc28fefa..45922ec1 100644 --- a/Global/Tags.gitignore +++ b/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 + diff --git a/Global/Vagrant.gitignore b/Global/Vagrant.gitignore new file mode 100644 index 00000000..a977916f --- /dev/null +++ b/Global/Vagrant.gitignore @@ -0,0 +1 @@ +.vagrant/ diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore index 351ec9d1..41968b07 100644 --- a/Global/Windows.gitignore +++ b/Global/Windows.gitignore @@ -7,3 +7,9 @@ Desktop.ini # Recycle Bin used on file shares $RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp diff --git a/Global/vim.gitignore b/Global/vim.gitignore index 51514eb2..6c5ee8df 100644 --- a/Global/vim.gitignore +++ b/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 diff --git a/Go.gitignore b/Go.gitignore index 00268614..83656241 100644 --- a/Go.gitignore +++ b/Go.gitignore @@ -20,3 +20,4 @@ _cgo_export.* _testmain.go *.exe +*.test diff --git a/Grails.gitignore b/Grails.gitignore index 96f72ec8..605132cf 100644 --- a/Grails.gitignore +++ b/Grails.gitignore @@ -41,4 +41,3 @@ # other *.iws - diff --git a/Joomla.gitignore b/Joomla.gitignore index bcd6feb9..54825f4e 100644 --- a/Joomla.gitignore +++ b/Joomla.gitignore @@ -393,4 +393,4 @@ tmp/* configuration.php index.php joomla.xml -*.txt
\ No newline at end of file +*.txt diff --git a/Kohana.gitignore b/Kohana.gitignore index 42d7030f..8b2ab01a 100644 --- a/Kohana.gitignore +++ b/Kohana.gitignore @@ -1,2 +1,2 @@ application/cache/* -application/logs/*
\ No newline at end of file +application/logs/* @@ -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"), diff --git a/LaTeX.gitignore b/LaTeX.gitignore index bbaaa01b..a0dd1c35 100644 --- a/LaTeX.gitignore +++ b/LaTeX.gitignore @@ -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 diff --git a/Leiningen.gitignore b/Leiningen.gitignore index 40fbb289..211769cb 100644 --- a/Leiningen.gitignore +++ b/Leiningen.gitignore @@ -4,3 +4,4 @@ pom.xml /classes/ /targets/ .lein-deps-sum +.lein-plugins/ diff --git a/LemonStand.gitignore b/LemonStand.gitignore index bc59f9c7..c7d94ad3 100644 --- a/LemonStand.gitignore +++ b/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
\ No newline at end of file +# add content_*.php if you don't want erase client changes to content diff --git a/Magento.gitignore b/Magento.gitignore index 52e8bb25..99f3332a 100644 --- a/Magento.gitignore +++ b/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/ diff --git a/Node.gitignore b/Node.gitignore index 4d063b5c..a72b52eb 100644 --- a/Node.gitignore +++ b/Node.gitignore @@ -12,4 +12,4 @@ logs results npm-debug.log -node_modules
\ No newline at end of file +node_modules diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 6a329198..8dcee63e 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -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 diff --git a/Perl.gitignore b/Perl.gitignore index c15b52a9..eaca02ed 100644 --- a/Perl.gitignore +++ b/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 diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore index 663eb677..b43233e1 100644 --- a/PlayFramework.gitignore +++ b/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 diff --git a/Processing.gitignore b/Processing.gitignore new file mode 100644 index 00000000..85f269a8 --- /dev/null +++ b/Processing.gitignore @@ -0,0 +1,7 @@ +.DS_Store +applet +application.linux32 +application.linux64 +application.windows32 +application.windows64 +application.macosx diff --git a/Python.gitignore b/Python.gitignore index ded60678..9ab94bd9 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -1,3 +1,4 @@ +# Byte-compiled / optimized / DLL files *.py[cod] # C extensions diff --git a/Qt.gitignore b/Qt.gitignore index 16b4ee58..fd2c573c 100644 --- a/Qt.gitignore +++ b/Qt.gitignore @@ -16,5 +16,6 @@ *.pro.user.* moc_*.cpp qrc_*.cpp -Makefile +ui_*.h +Makefile* *-build-* diff --git a/R.gitignore b/R.gitignore index 42effd3f..a0fd3b34 100644 --- a/R.gitignore +++ b/R.gitignore @@ -2,4 +2,4 @@ .Rhistory # Example code in package build process -*-Ex.R
\ No newline at end of file +*-Ex.R @@ -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). diff --git a/Rails.gitignore b/Rails.gitignore index bf692e15..2c74f70f 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -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 diff --git a/RubyMotion.gitignore b/RubyMotion.gitignore new file mode 100644 index 00000000..7e395179 --- /dev/null +++ b/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/ diff --git a/Scala.gitignore b/Scala.gitignore index f5b7d72a..28adf319 100644 --- a/Scala.gitignore +++ b/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
\ No newline at end of file +.scala_dependencies diff --git a/Sdcc.gitignore b/Sdcc.gitignore index a4cb9fcd..07ee7d59 100644 --- a/Sdcc.gitignore +++ b/Sdcc.gitignore @@ -6,4 +6,3 @@ *.rel *.rst *.sym - diff --git a/Symfony.gitignore b/Symfony.gitignore index ac10ca80..e5d08cbe 100644 --- a/Symfony.gitignore +++ b/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/*
\ No newline at end of file +web/*Plugin/* diff --git a/Symfony2.gitignore b/Symfony2.gitignore index 0b2956f9..f4a95cb4 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -11,3 +11,6 @@ web/bundles/* # Configuration files app/config/parameters.ini app/config/parameters.yml + +# Composer +composer.phar
\ No newline at end of file diff --git a/Typo3.gitignore b/Typo3.gitignore index 0ee23cbf..d1593b16 100644 --- a/Typo3.gitignore +++ b/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/ diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 99456160..00a10a5a 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -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 # ========================= diff --git a/WordPress.gitignore b/WordPress.gitignore index 6ff1e08d..7194a5b9 100644 --- a/WordPress.gitignore +++ b/WordPress.gitignore @@ -10,4 +10,4 @@ sitemap.xml *.log wp-content/cache/ wp-content/backups/ -sitemap.xml.gz
\ No newline at end of file +sitemap.xml.gz diff --git a/Yii.gitignore b/Yii.gitignore index 45a9a931..33a5154d 100644 --- a/Yii.gitignore +++ b/Yii.gitignore @@ -1,3 +1,3 @@ assets/ protected/runtime/ -themes/classic/views/
\ No newline at end of file +themes/classic/views/ diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore index 0b8e5951..014f93f6 100644 --- a/ZendFramework.gitignore +++ b/ZendFramework.gitignore @@ -3,4 +3,3 @@ LICENSE.txt README.txt demos/ extras/documentation - |