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);
     };
     
     /**