From 140394b7ab67124f186358a4471164cb4a1ae967 Mon Sep 17 00:00:00 2001
From: arpitchakladar <arpitchakladar@gmail.com>
Date: Wed, 9 Sep 2026 19:37:41 +0530
Subject: refactor: removing with pkgs blocks, other minor changes

---
 modules/development/git/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/development/git/default.nix')

diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index ce92674..15dcc80 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -61,6 +61,7 @@
           log.showSignature = true;
           pull.rebase = true;
           init.defaultBranch = "master";
+          merge.ff = false;
         }
 
         (lib.optionalAttrs config.development.delta.enable {
-- 
cgit v1.2.3