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

feat(git): configure nvim as mergetool

Browse source
This commit is contained in:
Michael Mandl 2022-09-13 08:19:59 +02:00
parent 8538d24ad4
commit 5e6359fc23
Signed by: mandlm
GPG key ID: 4AA25D647AA54CC7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home-manager/git.nix
View file

@ -28,6 +28,10 @@
difftool.prompt = false; difftool.prompt = false;
difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\""; difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
pager.difftool = true; pager.difftool = true;
merge.tool = "nvim";
mergetool.prompt = false;
mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
}; };
aliases = { aliases = {