From 3b9e007836cffae4e9ca414a7108876876f26a5f Mon Sep 17 00:00:00 2001
From: Rodolphe Breard <rodolphe@what.tf>
Date: Wed, 10 Jun 2020 11:49:57 +0200
Subject: [PATCH] Do not rebase on pull

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

diff --git a/.gitconfig b/.gitconfig
index 4e07456..6d1af9b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -60,3 +60,6 @@
 
 [commit]
     template = ~/.git_commit_msg.txt
+
+[pull]
+    rebase = false