From f78818038e7218ac0882a87ad47b2b3a271947f4 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 12 Sep 2013 11:32:38 +0000
Subject: [PATCH] feature(update) git pull -> git pull --rebase

---
 lib/server/update.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/server/update.js b/lib/server/update.js
index 81902a04..16df1b35 100644
--- a/lib/server/update.js
+++ b/lib/server/update.js
@@ -19,7 +19,7 @@
         DIR             = main.DIR;
     
     exports.get = function(){
-        exec('git pull', {cwd : DIR}, pull);
+        exec('git pull --rebase', {cwd : DIR}, pull);
     };
     
     /**