mandlm/nixos-config
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mandlm 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\"";