diff --git a/gibo b/gibo
index a90d0f1..96de643 100755
--- a/gibo
+++ b/gibo
@@ -76,7 +76,7 @@ upgrade() {
         clone
     else
         cd "$local_repo"
-        git pull origin master
+        git pull --ff origin master
     fi
 }
 
diff --git a/gibo.bat b/gibo.bat
index 29a5421..8a27f3c 100644
--- a/gibo.bat
+++ b/gibo.bat
@@ -171,7 +171,7 @@ goto :setup
     if not exist "%local_repo%\.git" call :clone && goto :eof
 
     pushd "%local_repo%"
-    git pull origin master
+    git pull --ff origin master
     popd
 
     goto :eof