master branch merged into scripting.

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c9119a2faef0221f1df8e465051b2012417b728b..90b8434052714415e8c83a4d801bd1ad299defed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,26 @@
+.*.swp
 *.o
 *.rdb
+*.log
 redis-cli
 redis-server
 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