diff --git a/shell/.gitconfig b/shell/.gitconfig
index 0ce8612..57a315e 100644
--- a/shell/.gitconfig
+++ b/shell/.gitconfig
@@ -27,10 +27,11 @@
     excludesfile = ~/.config/gitignore_global
 [diff]
     tool = meld
+    indentHeuristic = true
 [merge]
     tool = meld
 [pull]
-    rebase = true
+    ff-only = true
 [rebase]
     autostash = true
     autosquash = true