From c1f5b2a38369f008114834e22a056e45c552a723 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Tue, 3 Nov 2020 15:31:24 +0100
Subject: Update git config

---
 home.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/home.nix b/home.nix
index 6b5304c..230ae37 100644
--- a/home.nix
+++ b/home.nix
@@ -37,8 +37,11 @@ in {
     userName  = "Adrian Kummerlaender";
     userEmail = "adrian@kummerlaender.eu";
 
-    extraConfig.core.editor = "vim";
-    extraConfig.merge.tool = "${pkgs.meld}/bin/meld";
+    extraConfig = {
+      core.editor = "vim";
+      merge.tool = "${pkgs.meld}/bin/meld";
+      pull.ff = "only";
+    };
   };
 
   programs.ssh = {
-- 
cgit v1.2.3