From dce97917c3cb22a220d740a6f3143bf4f2cdedaa Mon Sep 17 00:00:00 2001
From: Christophe Laffont <claffont@openstudio.fr>
Date: Tue, 11 Mar 2014 09:59:07 +0100
Subject: [PATCH 1/2] Improve gitignore rules for modules and templates

---
 .gitignore | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a6845dd3e..65ccbeaa3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,19 @@ xhprof/
 phpunit.phar
 .DS_Store
 phpmyadmin
-templates/default-esi
-local/modules/TemplateEsiModule
 composer.phar
-web/.htaccess
+web/.
+
+# Ignore everything in the "modules" directory, except the "default modules"
+local/modules/*
+!local/modules/Cheque/
+!local/modules/Front/
+!local/modules/TheliaDebugBar/
+!local/modules/Tinymce/
+
+# Ignore everything in the "templates" directory, except the "default template"
+templates/*
+!templates/backOffice/
+!templates/email/
+!templates/frontOffice/
+!templates/pdf/

From 5eb8f3a13df430f4c5a6aae6e6385fab3ef8c03b Mon Sep 17 00:00:00 2001
From: Christophe Laffont <claffont@openstudio.fr>
Date: Tue, 11 Mar 2014 10:02:11 +0100
Subject: [PATCH 2/2] Missing htaccess

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 65ccbeaa3..bb3b4d299 100755
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ phpunit.phar
 .DS_Store
 phpmyadmin
 composer.phar
-web/.
+web/.htaccess
 
 # Ignore everything in the "modules" directory, except the "default modules"
 local/modules/*