Merge remote branch 'pietern/bench-fix'

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c9119a2faef0221f1df8e465051b2012417b728b..90c9462166fb18cf0b778e99bf8dbcbb57b0620b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,20 @@
 *.o
 *.rdb
 *.o
 *.rdb

+*.log

 redis-cli
 redis-server
 redis-benchmark
 redis-cli
 redis-server
 redis-benchmark

+redis-check-dump
+redis-check-aof

 doc-tools
 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