Force --ff option

simonwhitaker · Sep 6, 2017 · 4bb17ad · 4bb17ad
1 parent 8bdc687
commit 4bb17ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,7 @@ upgrade() { @@
             clone
         else
             cd "$local_repo"
-            git pull origin master
+            git pull --ff origin master
         fi
     }
@@ Expand Down @@