Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 90c9462166fb18cf0b778e99bf8dbcbb57b0620b..5f262c4617928cbc4adf7e4d01cc06ad7fa3ca8d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.*.swp
 *.o
 *.rdb
 *.log
@@ -8,13 +9,18 @@ redis-check-dump
 redis-check-aof
 doc-tools
 release
-myredis.conf
 misc/*
 src/release.h
 appendonly.aof
 SHORT_TERM_TODO
-redis.conf.*
 release.h
 src/transfer.sh
 src/configs
 src/redis-server.dSYM
+redis.ds
+src/redis.conf
+deps/lua/src/lua
+deps/lua/src/luac
+deps/lua/src/liblua.a
+.make-*
+.prerequisites