Merge branch 'master' into 2257-inequality-conditions

[arvados.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1d11e812ab9522d1e446aa43462221a0155def4c..4d6cc39a237559d2d2530bef984194cb456ee1cf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,7 @@
-# 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
-
-config/.secret_token
+*~
+*.pyc
+docker/*/generated/*
+docker/config.yml
+doc/_site/*
+doc/.site/*
+doc/sdk/python/arvados
\ No newline at end of file