master branch merged into scripting.

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5463a140850da9ef907fb2b550083e48200ed43a..90b8434052714415e8c83a4d801bd1ad299defed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-00-RELEASENOTES
+.*.swp
 *.o
 *.rdb
 *.log
@@ -8,7 +8,19 @@ redis-benchmark
 redis-check-dump
 redis-check-aof
 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