tsivinsky/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use nvim as git mergetool

Browse Source
This commit is contained in:
Dan Tsivinsky
2022-02-23 11:24:31 +03:00
parent 08cea9d553
commit 7b6ff5e796
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/.gitconfig
View File

@@ -2,8 +2,14 @@
email = daniil@tsivinsky.com email = daniil@tsivinsky.com
name = Daniil Tsivinsky name = Daniil Tsivinsky
[core] [core]
editor = nvim editor = vim
[init] [init]
defaultBranch = master defaultBranch = master
[push] [push]
followTags = true followTags = true
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[merge]
tool = nvim
[mergetool]
prompt = false