Git: Enable merge by default

2024-08-09 16:11:54 +02:00 · 2024-08-09 16:11:54 +02:00 · dd03bd6090
commit dd03bd6090
parent 71393d8ec5
1 changed files with 1 additions and 0 deletions
--- a/home/features/cli/git.nix
+++ b/home/features/cli/git.nix
@ -12,6 +12,7 @@
      commit.gpgsign = true;
      user.signingkey = "0x2C2C1C62A5388E82";
      init.defaultBranch = "main";
+      pull.rebase = false; # merge by default
    };
    lfs.enable = true;
    aliases = {