From b59bc640dc2aaa3044c0802eaef7a85000752768 Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Tue, 28 Jul 2020 12:54:56 +0200
Subject: [PATCH] git: change pull default to ff

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

diff --git a/.gitconfig b/.gitconfig
index 950eac9..a1e3f9c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -140,4 +140,5 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 [pull]
-	rebase = true
+    #rebase = true
+	ff = only