mandlm/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(git): disable fast-forward merging by default

Browse source
This commit is contained in:
Michael Mandl 2022-11-10 09:06:52 +01:00
parent c498fe2723
commit a901458799
Signed by: mandlm
GPG key ID: 4AA25D647AA54CC7
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home-manager/git.nix
View file

@ -23,6 +23,7 @@
log.date = "relative"; log.date = "relative";
merge.ff = false;
merge.tool = "nvim"; merge.tool = "nvim";
mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\""; mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";