diff options
Diffstat (limited to 'modules/development/git/default.nix')
| -rw-r--r-- | modules/development/git/default.nix | 1 |
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 { |