Merge branch 'master' into 2221-complete-docker

[arvados.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1917260e39c04ac95033ffdc3afa74e359daaa3d..f27930edc8e21749c176acd1c3e4d4dbc5f794bb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,11 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
-
-# Some sensitive files
-/config/api.clinicalfuture.com.*
-/config/database.yml
-
-# asset cache
-/public/assets/
+*~
+*.pyc
+docker/*/generated/*
+docker/config.yml
+doc/_site/*
+doc/.site/*
+doc/sdk/python/arvados
+sdk/perl/MYMETA.*
+sdk/perl/Makefile
+sdk/perl/blib/*
+sdk/perl/pm_to_blib