From d25215793d483556c4edb85b4a7966a853ec2764 Mon Sep 17 00:00:00 2001
From: Bruno Carlin <bruno.carlin@waarp.org>
Date: Wed, 10 Jun 2020 17:00:06 +0200
Subject: [PATCH] disable rebase strategy for pulls in git

---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 4b4b118..20dc705 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -31,3 +31,5 @@
 [merge]
 	tool = vimdiff
 	guitool = meld
+[pull]
+	rebase = false