aboutsummaryrefslogtreecommitdiffstats
path: root/modules/development/git/default.nix
diff options
context:
space:
mode:
authorarpitchakladar <arpitchakladar@gmail.com>2026-09-09 19:37:41 +0530
committerarpitchakladar <arpitchakladar@gmail.com>2026-09-09 19:37:41 +0530
commit140394b7ab67124f186358a4471164cb4a1ae967 (patch)
treee1a367d69004dcf3aee0abd04787ae2fd2b416cb /modules/development/git/default.nix
parent4a9bd882f7fdf00b26427ea70572dc38e7cab8bf (diff)
downloadhome-manager-config-140394b7ab67124f186358a4471164cb4a1ae967.tar.gz
home-manager-config-140394b7ab67124f186358a4471164cb4a1ae967.zip
refactor: removing with pkgs blocks, other minor changes
Diffstat (limited to 'modules/development/git/default.nix')
-rw-r--r--modules/development/git/default.nix1
1 files changed, 1 insertions, 0 deletions
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 {