Git: Enable merge by default

This commit is contained in:
GHOSCHT 2024-08-09 16:11:54 +02:00
parent 71393d8ec5
commit dd03bd6090
Signed by: ghoscht
GPG key ID: 2C2C1C62A5388E82

View file

@ -12,6 +12,7 @@
commit.gpgsign = true; commit.gpgsign = true;
user.signingkey = "0x2C2C1C62A5388E82"; user.signingkey = "0x2C2C1C62A5388E82";
init.defaultBranch = "main"; init.defaultBranch = "main";
pull.rebase = false; # merge by default
}; };
lfs.enable = true; lfs.enable = true;
aliases = { aliases = {