From b5bcfc2e2262f88a0f1c72b21e4adadf446ec6ca Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg <alex@grin.io>
Date: Tue, 8 Mar 2016 10:21:13 -0500
Subject: [PATCH 1/2] fix gitignore, undefined var

---
 .gitignore             | 2 +-
 view/mail/joinList.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index adea052c..f4e60abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .sass-cache
+/data/config.php
 /web/css/*
 /log
-/data/secret
 /web/zohoverify
 nbproject
 
diff --git a/view/mail/joinList.php b/view/mail/joinList.php
index 98cada69..e831fca8 100644
--- a/view/mail/joinList.php
+++ b/view/mail/joinList.php
@@ -1,3 +1,4 @@
+<?php $error = isset($error) ? $error : null ?>
 <form action="/list-subscribe" method="post" novalidate>
   <?php if ($error): ?>
     <div class="notice notice-error spacer1"><?php echo $error ?></div>
@@ -30,4 +31,4 @@
       <?php endif ?>
     </div>
   <?php endif ?>
-</form>
\ No newline at end of file
+</form>

From 3714b604183219f3104e319af06c8346b8e6a773 Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg <alex@grin.io>
Date: Thu, 10 Mar 2016 20:31:47 -0500
Subject: [PATCH 2/2] change git pull so it doesn't choke if there are local
 changes

---
 update.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/update.php b/update.php
index 538fd48c..35aee7f0 100755
--- a/update.php
+++ b/update.php
@@ -5,8 +5,7 @@ include __DIR__.'/bootstrap.php';
 
 chdir(ROOT_DIR);
 
-Shell::exec('rm ./web/css/*');
-Shell::exec('git checkout master && git pull');
+Shell::exec('git fetch && git reset --hard origin/master');
 
 $scss = new \Leafo\ScssPhp\Compiler();