Merge branch 'master' into check-aof

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c8a56bc70829e3684685d0013f831629f7bcf6e6..5463a140850da9ef907fb2b550083e48200ed43a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,14 @@
+00-RELEASENOTES
 *.o
 *.rdb
+*.log
 redis-cli
 redis-server
 redis-benchmark
+redis-check-dump
+redis-check-aof
 doc-tools
 mkrelease.sh
 release
+myredis.conf
+misc/*