Git: Enable merge by default
This commit is contained in:
parent
71393d8ec5
commit
dd03bd6090
1 changed files with 1 additions and 0 deletions
|
@ -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 = {
|
||||||
|
|
Loading…
Reference in a new issue