Merge pull request #77 from Poincare/patch-1

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6d12b5e234fe591f046c2ec90b515145e0951d14..90b8434052714415e8c83a4d801bd1ad299defed 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/*


@@ -18,3 +17,10 @@ SHORT_TERM_TODO
 redis.conf.*
 release.h
 src/transfer.sh
 redis.conf.*
 release.h
 src/transfer.sh

+src/configs
+src/redis-server.dSYM
+redis.ds
+src/redis.conf
+deps/lua/src/lua
+deps/lua/src/luac
+deps/lua/src/liblua.a