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";