Merge branch 'unstable'

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0d48fc80fe992fcb5ba1c1f402435b8bf92ad11c..06ebf60d69f7a04f505733ea3a9e18e1e558c489 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-00-RELEASENOTES
+.*.swp

 *.o
 *.rdb
 *.log
 *.o
 *.rdb
 *.log


@@ -8,7 +8,6 @@ redis-benchmark
 redis-check-dump
 redis-check-aof
 doc-tools
 redis-check-dump
 redis-check-aof
 doc-tools

-mkrelease.sh

 release
 myredis.conf
 misc/*
 release
 myredis.conf
 misc/*


@@ -20,3 +19,5 @@ release.h
 src/transfer.sh
 src/configs
 src/redis-server.dSYM
 src/transfer.sh
 src/configs
 src/redis-server.dSYM

+redis.ds
+src/redis.conf