Merge remote branch 'pietern/ziplist-eff'

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ed57c1bf91ff1091457aacff0b68838dd28d2f64..a97e3a84d27d1d85cbcc7cc8859d8112b3fff3ed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,7 @@ mkrelease.sh
 release
 myredis.conf
 misc/*
-release.h
+src/release.h
+appendonly.aof
+SHORT_TERM_TODO
+redis.conf.*