Merge pull request #544 from dvirsky/2.6

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9d3423fedf4687b87758b75be6c5a72f650ae90f..89afeb0f79b6fcd72978fdbeaf6081175baa7ad3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,22 @@
+.*.swp
 *.o
 *.rdb
 *.log
-redis-cli
-redis-server
-redis-benchmark
-redis-check-dump
-redis-check-aof
+redis-*
 doc-tools
-mkrelease.sh
 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
+*.dSYM