From 579901e786c20e74d0e3d76aa3db43174b25c292 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Wed, 21 Feb 2024 16:21:33 +0100
Subject: [PATCH] git: Add extra config

- pull via rebase by default
- use three-way-diff
- recurse into submodules
---
 home/alex/programs/git/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/home/alex/programs/git/default.nix b/home/alex/programs/git/default.nix
index 21f6fc9..b106d5a 100644
--- a/home/alex/programs/git/default.nix
+++ b/home/alex/programs/git/default.nix
@@ -13,6 +13,13 @@
     # TODO create option for my own account meta data
     userEmail = "me@failco.de";
     userName = "Alexander Kobjolke";
+
+    extraConfig = {
+      pull = { rebase = true; };
+      merge = { conflictstyle = "diff3"; };
+      submodule = { recurse = true; };
+    };
+
     aliases = {
       a = "add";
       c = "commit";