simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

git: Only allow fast-forward merge by default

Browse source
This commit is contained in:
Simon Bruder 2023-10-25 21:18:56 +02:00
parent 45d4a30aac
commit bfec11bb29
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
users/simon/modules/git.nix
View file

@ -18,6 +18,9 @@
# LTeX: enabled=false''); # LTeX: enabled=false'');
core.quotepath = "off"; core.quotepath = "off";
pull.ff = "only"; pull.ff = "only";
merge = {
ff = "only";
};
diff = { diff = {
age = { age = {
# This uses the de facto default key location with no ability to # This uses the de facto default key location with no ability to