diff --git a/Android.gitignore b/Android.gitignore index 927ef51..64d3c97 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -1,23 +1,23 @@ -# 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/ # Local configuration file (sdk path, etc) local.properties # Proguard folder generated by Eclipse proguard/ diff --git a/DM.gitignore b/DM.gitignore new file mode 100644 index 0000000..34f782a --- /dev/null +++ b/DM.gitignore @@ -0,0 +1,5 @@ +*.dmb +*.rsc +*.int +*.lk +*.zip \ No newline at end of file diff --git a/Dart.gitignore b/Dart.gitignore index f336509..2914c1b 100644 --- a/Dart.gitignore +++ b/Dart.gitignore @@ -1,11 +1,11 @@ // Don’t commit the following files and directories created by pub and dart2js packages/ *.js_ *.js.deps *.js.map // Include when developing application packages -pubspec.lock +pubspec.lock // Avoid committing generated JavaScript files *.dart.js diff --git a/Delphi.gitignore b/Delphi.gitignore index 02acd6a..e186b94 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -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/ +*.~* diff --git a/Global/Cloud9.gitignore b/Global/Cloud9.gitignore index b9f8a36..3f4384d 100644 --- a/Global/Cloud9.gitignore +++ b/Global/Cloud9.gitignore @@ -1,2 +1,3 @@ # Cloud9 IDE - http://c9.io .c9revisions +.c9 diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index 7272776..984a6ef 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -1,27 +1,30 @@ *.pydevproject .metadata .gradle bin/ tmp/ *.tmp *.bak *.swp *~.nib local.properties .settings/ .loadpath # External tool builders .externalToolBuilders/ # Locally stored "Eclipse launch configurations" *.launch # CDT-specific .cproject # PDT-specific .buildpath +# sbteclipse plugin +.target + # TeXlipse plugin .texlipse diff --git a/Global/EiffelStudio.gitignore b/Global/EiffelStudio.gitignore new file mode 100644 index 0000000..a7ba35f --- /dev/null +++ b/Global/EiffelStudio.gitignore @@ -0,0 +1,2 @@ +# The compilation directoy +EIFGENs diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 5db4d2e..47e551f 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,23 +1,29 @@ # 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/ + +# generated by JIRA plugin +atlassian-ide-plugin.xml + +# generated by Crashlytics plugin (for Android Studio and Intellij) +com_crashlytics_export_strings.xml diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore index b25c15b..9911632 100644 --- a/Global/Linux.gitignore +++ b/Global/Linux.gitignore @@ -1 +1,4 @@ *~ + +# KDE directory preferences +.directory diff --git a/Global/SASS.gitignore b/Global/SASS.gitignore deleted file mode 100644 index c1df001..0000000 --- a/Global/SASS.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -### Sass Ignores - "Sassy CSS" http://sass-lang.com/ -*.sass-cache diff --git a/Grails.gitignore b/Grails.gitignore index b827da0..22bf40d 100644 --- a/Grails.gitignore +++ b/Grails.gitignore @@ -1,43 +1,30 @@ # .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.* # general HSQL database files *Db.properties *Db.script # logs /stacktrace.log /test/reports /logs # project release file /*.war # plugin release files /*.zip /plugin.xml # older plugin install locations /plugins /web-app/plugins # "temporary" build files /target - -# other -*.iws diff --git a/Haskell.gitignore b/Haskell.gitignore index cc14307..01e585a 100644 --- a/Haskell.gitignore +++ b/Haskell.gitignore @@ -1,11 +1,11 @@ dist cabal-dev *.o *.hi *.chi *.chs.h -.virthualenv +.virtualenv .hsenv .cabal-sandbox/ cabal.sandbox.config cabal.config diff --git a/Idris.gitignore b/Idris.gitignore new file mode 100644 index 0000000..c28bc7c --- /dev/null +++ b/Idris.gitignore @@ -0,0 +1,2 @@ +*.ibc +*.o diff --git a/VisualStudio.gitignore b/IgnorePackages similarity index 86% rename from VisualStudio.gitignore rename to IgnorePackages index 15ecea9..d5ab3be 100644 --- a/VisualStudio.gitignore +++ b/IgnorePackages @@ -1,179 +1,188 @@ ## 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/ [Dd]ebugPublic/ [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 +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + *_i.c *_p.c *_i.h *.ilk *.meta *.obj *.pch *.pdb *.pgc *.pgd *.rsp *.sbr *.tlb *.tli *.tlh *.tmp *.tmp_proj *.log *.vspscc *.vssscc .builds *.pidb *.svclog *.scc # Chutzpah Test files _Chutzpah* # Visual C++ cache files ipch/ *.aps *.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*/ *.[Rr]e[Ss]harper *.DotSettings.user # JustCode is a .NET coding addin-in .JustCode # TeamCity is a build add-in _TeamCity* # DotCover is a Code Coverage Tool *.dotCover # NCrunch *.ncrunch* _NCrunch_* .*crunch*.local.xml # MightyMoose *.mm.* AutoTest.Net/ +# Web workbench (sass) +.sass-cache/ + # 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 *.[Pp]ublish.xml *.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 # Windows Store app package directory AppPackages/ # Others sql/ *.Cache ClientBin/ [Ss]tyle[Cc]op.* ~$* *~ *.dbmdl *.dbproj.schemaview *.pfx *.publishsettings +node_modules/ # 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 +*.mdf +*.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/ diff --git a/Java.gitignore b/Java.gitignore index 009ce16..32858aa 100644 --- a/Java.gitignore +++ b/Java.gitignore @@ -1,9 +1,12 @@ *.class # Mobile Tools for Java (J2ME) .mtj.tmp/ # Package Files # *.jar *.war *.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/LICENSE b/LICENSE index f247e59..ac31f1a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,19 @@ -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"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Leiningen.gitignore b/Leiningen.gitignore index b8d3245..0ef5d3f 100644 --- a/Leiningen.gitignore +++ b/Leiningen.gitignore @@ -1,8 +1,11 @@ pom.xml +pom.xml.asc *jar /lib/ /classes/ /target/ +/checkouts/ .lein-deps-sum .lein-repl-history .lein-plugins/ +.lein-failures diff --git a/Magento.gitignore b/Magento.gitignore index 7eac466..3309871 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -1,115 +1,121 @@ .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/ app/design/frontend/base/ app/design/frontend/default/blank/ app/design/frontend/default/default/ app/design/frontend/default/iphone/ app/design/frontend/default/modern/ app/design/frontend/enterprise/default app/design/install/ 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 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 app/etc/local.xml.template app/etc/local.xml app/.htaccess app/locale/ app/Mage.php cron.php cron.sh downloader/ errors/ favicon.ico get.php includes/ index.php index.php.sample /install.php js/blank.html js/calendar/ js/enterprise/ js/extjs/ js/firebug/ js/flash/ js/index.php js/jscolor/ js/lib/ js/mage/ js/prototype/ js/scriptaculous/ js/spacer.gif js/tiny_mce/ js/varien/ lib/3Dsecure/ lib/Apache/ lib/flex/ lib/googlecheckout/ lib/.htaccess lib/LinLibertineFont/ lib/Mage/ lib/PEAR/ lib/phpseclib/ lib/Varien/ lib/Zend/ +lib/Cm/ +lib/Credis/ +lib/Magento/ LICENSE_AFL.txt LICENSE.html LICENSE.txt LICENSE_EE* mage media/customer/ media/dhl/ media/downloadable/ media/.htaccess media/import/ media/xmlconnect/ media/catalog/product/cache/ - +api.php nbproject/ pear pear/ php.ini.sample pkginfo/ RELEASE_NOTES.txt shell/abstract.php shell/compiler.php shell/indexer.php shell/log.php skin/adminhtml/default/default/ skin/adminhtml/default/enterprise skin/frontend/base/ skin/frontend/default/blank/ skin/frontend/default/blue/ skin/frontend/default/default/ skin/frontend/default/french/ skin/frontend/default/german/ skin/frontend/default/iphone/ skin/frontend/default/modern/ skin/frontend/enterprise skin/install/ var/ diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore index ed27485..3bf0228 100644 --- a/PlayFramework.gitignore +++ b/PlayFramework.gitignore @@ -1,17 +1,19 @@ # Ignore Play! working directory # bin db eclipse lib log logs modules precompiled project/project project/target target tmp test-result server.pid *.iml *.eml +dist +.cache diff --git a/Python.gitignore b/Python.gitignore index 50a8726..76f2a46 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -1,51 +1,53 @@ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] # C extensions *.so # Distribution / packaging +.Python +env/ bin/ build/ develop-eggs/ dist/ eggs/ lib/ lib64/ parts/ sdist/ var/ *.egg-info/ .installed.cfg *.egg # Installer logs pip-log.txt pip-delete-this-directory.txt # Unit test / coverage reports .tox/ .coverage .cache nosetests.xml coverage.xml # Translations *.mo # Mr Developer .mr.developer.cfg .project .pydevproject # Rope .ropeproject # Django stuff: *.log *.pot # Sphinx documentation docs/_build/ diff --git a/Rails.gitignore b/Rails.gitignore index 5645440..1a2c94d 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -1,26 +1,24 @@ *.rbc -*.sassc -.sass-cache capybara-*.html .rspec /log /tmp /db/*.sqlite3 /public/system /coverage/ /spec/tmp **.orig rerun.txt pickle-email-*.html config/initializers/secret_token.rb config/secrets.yml ## 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 diff --git a/SCons.gitignore b/SCons.gitignore new file mode 100644 index 0000000..39d9743 --- /dev/null +++ b/SCons.gitignore @@ -0,0 +1,2 @@ +# for projects that use SCons for building: http://http://www.scons.org/ +.sconsign.dblite diff --git a/Compass.gitignore b/Sass.gitignore similarity index 100% rename from Compass.gitignore rename to Sass.gitignore diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index c2d893a..842c3ec 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -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/ diff --git a/TeX.gitignore b/TeX.gitignore index b0a911e..f19b71f 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -1,78 +1,79 @@ ## 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 +*.synctex.gz(busy) *.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 diff --git a/Umbraco.gitignore b/Umbraco.gitignore new file mode 100644 index 0000000..be2db99 --- /dev/null +++ b/Umbraco.gitignore @@ -0,0 +1,9 @@ +# Ignore Umbraco folders (Generated folders created by Umbraco) +ClientDependency/ +TEMP/ +Logs/ +Cached/ +ExamineIndexes/ + +# Ignore Umbraco content cache file +umbraco.config diff --git a/Unity.gitignore b/Unity.gitignore index 0051458..4d8768d 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -1,11 +1,13 @@ [Ll]ibrary/ [Tt]emp/ [Oo]bj/ # Autogenerated VS/MD solution and project files /*.csproj /*.unityproj /*.sln /*.suo /*.user +/*.userprefs /*.pidb +/*.booproj diff --git a/WordPress.gitignore b/WordPress.gitignore index 8e22e0e..017e193 100644 --- a/WordPress.gitignore +++ b/WordPress.gitignore @@ -1,12 +1,13 @@ .htaccess wp-content/uploads/ wp-content/blogs.dir/ wp-content/upgrade/ wp-content/backup-db/ wp-content/advanced-cache.php wp-content/wp-cache-config.php sitemap.xml *.log wp-content/cache/ wp-content/backups/ sitemap.xml.gz +wp-config.php diff --git a/nanoc.gitignore b/nanoc.gitignore index 4a2728c..abc2182 100644 --- a/nanoc.gitignore +++ b/nanoc.gitignore @@ -1,10 +1,10 @@ -# 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/ # Temporary file directory tmp/ # Crash Log crash.log