Merge remote branch 'pietern/unstable-brpoplpush' into unstable

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 90c9462166fb18cf0b778e99bf8dbcbb57b0620b..9fad5da7d3f87257a60d83500efbf143eacfb757 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ release.h
 src/transfer.sh
 src/configs
 src/redis-server.dSYM
+redis.ds
+src/redis.conf