From 378b0a63d7f351f303463f2a89a7b51bf22c1279 Mon Sep 17 00:00:00 2001
From: Boris Egorov <egorov@linux.com>
Date: Wed, 30 Nov 2016 10:17:34 +0700
Subject: [PATCH] shell/git: Enable indentHeuristic, switch to ff-only on merge

---
 shell/.gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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