master branch merged into scripting.

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 90c9462166fb18cf0b778e99bf8dbcbb57b0620b..90b8434052714415e8c83a4d801bd1ad299defed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.*.swp
 *.o
 *.rdb
 *.log
@@ -18,3 +19,8 @@ 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