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

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a97e3a84d27d1d85cbcc7cc8859d8112b3fff3ed..9fad5da7d3f87257a60d83500efbf143eacfb757 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-00-RELEASENOTES
 *.o
 *.rdb
 *.log
@@ -8,7 +7,6 @@ redis-benchmark
 redis-check-dump
 redis-check-aof
 doc-tools
-mkrelease.sh
 release
 myredis.conf
 misc/*
@@ -16,3 +14,9 @@ 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