Merge remote branch 'visionmedia/cli-help' into cli-help

[redis.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c8a56bc70829e3684685d0013f831629f7bcf6e6..6d12b5e234fe591f046c2ec90b515145e0951d14 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,20 @@
+00-RELEASENOTES
 *.o
 *.rdb
+*.log
 redis-cli
 redis-server
 redis-benchmark
+redis-check-dump
+redis-check-aof
 doc-tools
 mkrelease.sh
 release
+myredis.conf
+misc/*
+src/release.h
+appendonly.aof
+SHORT_TERM_TODO
+redis.conf.*
+release.h
+src/transfer.sh