From 4e33369995224606d9c46550554cf06adeef5567 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sun, 9 Sep 2018 18:56:44 +0200
Subject: [git] ff by default

---
 git/.gitconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 1dd05ae..8b42407 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -9,9 +9,11 @@
 [alias]
 	ctags = !.git/hooks/ctags
 	saveandsync = !git add . && git commit -m "Update" && git push origin master
-[push]
-	default = simple
 [http]
 	sslverify = false
 [commit]
-        gpgSign = True
+        gpgSign = true
+[push]
+	default = simple
+[merge]
+	ff = true
-- 
cgit v1.2.3