3354: Merge branch 'master' into 3354-render-textile

[arvados.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index eb3489a986bd8af22f03119e8989e9d10a4999d4..8cc6b89324311d0cd7db51f9c6a5e7ba400253dc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,19 @@
-# 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
+.bundle
+.rvmrc
+*~
+*.pyc
+docker/*/generated
+docker/config.yml
+doc/.site
+doc/sdk/python/arvados
+sdk/perl/MYMETA.*
+sdk/perl/Makefile
+sdk/perl/blib
+sdk/perl/pm_to_blib
+*/vendor/bundle
+sdk/java/target
+*.class
+apps/workbench/vendor/bundle
+services/api/vendor/bundle
+sdk/java/log
+sdk/cli/vendor