From 1ff02c346980150b5e662c21a0c3174b70e66a03 Mon Sep 17 00:00:00 2001
From: Olivier DOSSMANN <git@dossmann.net>
Date: Wed, 1 Jul 2020 16:21:48 +0200
Subject: [PATCH] =?UTF-8?q?GIT:=20M=C3=A0J=20de=20la=20configuration=20sui?=
 =?UTF-8?q?te=20aux=20changements=20des=20git=20pull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitconfig b/.gitconfig
index 0c1fcf7..48862d8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,4 +11,6 @@
   excludesfile = /home/od/.gitignore_global
 	quotePath = false
 [commit]
-	template = /home/od/.gitmessage.txt
+  template = /home/od/.gitmessage.txt
+[pull]
+  rebase = false