change git setting

profile/globi/.gitconfig

@@ -75,13 +75,13 @@
 
 [pull]
     # Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` otherwise.
-    ff = only
+    #ff = only
     # Use `git pull --rebase` by default, otherwise use `git fetch; git merge`
-    #rebase = true
+    rebase = true
 
 [rebase]
     # Automatically stash and pop your uncommitted changes
-    #autoStash = true
+    autoStash = true
 
 [alias]
     co = checkout