From 096c11fee22282591b3ffbb31679438528fecac5 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Mon, 13 Nov 2023 10:04:29 +0100
Subject: [PATCH] git: Config tweaks

---
 modules/development/git/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index bb6357e0..46c8f0a3 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -24,8 +24,10 @@
           lfs.enable = true;
           extraConfig = {
             branch.autosetuprebase = "always";
-            pull.rebase = true;
             github.user = "chvp";
+            merge.conflictStyle = "diff3";
+            pull.rebase = true;
+            rerere.enabled = true;
             tag.gpgSign = true;
           };
           ignores = [