From 8b077316d4974f6aeee5cb2c83a7c624c558f0c6 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Sun, 4 Feb 2024 00:01:06 +0100
Subject: [PATCH] git pull rebase true

---
 dot_config/git/private_config.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_config/git/private_config.tmpl b/dot_config/git/private_config.tmpl
index db2f0d4..6c2409e 100644
--- a/dot_config/git/private_config.tmpl
+++ b/dot_config/git/private_config.tmpl
@@ -75,7 +75,7 @@
 [merge]
     conflictstyle = diff3
 [pull]
-    rebase = false
+    rebase = true
 [init]
     defaultBranch = master
 [advice]