shell/git: Enable indentHeuristic, switch to ff-only on merge

ATommasi · Nov 30, 2016 · 378b0a6 · 378b0a6
1 parent b6c1941
commit 378b0a6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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