From 78907a1f4d30fdcb00193d7419ea28aa1b1bd699 Mon Sep 17 00:00:00 2001
From: Vikhyat Korrapati <vikhyatk@gmail.com>
Date: Fri, 16 May 2014 03:59:45 +0530
Subject: [PATCH] Don't ignore the emoji and poll plugins in .gitignore.

---
 .gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 600b404bc6c..4a6c9eef420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,10 +36,14 @@ config/discourse.conf
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
-/plugins
 /logfile
 log/
 
+# Ignore plugins except for the bundled ones.
+/plugins
+!/plugins/emoji
+!/plugins/poll
+
 /spec/fixtures/plugins/my_plugin/auto_generated
 
 # Ignore Eclipse .project file