Browse Source

Opt for nvr.

master
jackyalcine 2 months ago
parent
commit
7886fb4f5b
1 changed files with 9 additions and 3 deletions
  1. +9
    -3
      home/.gitconfig

+ 9
- 3
home/.gitconfig View File

@@ -13,7 +13,7 @@
default = tracking

[merge]
tool = nvim
tool = nvr
stat = true
log = true
ff = true
@@ -24,8 +24,14 @@
[mergetool]
prompt = false

[mergetool.nvim]
cmd = nvim -d -o $LOCAL $REMOTE $MERGED
[diff]
tool = nvr

[difftool "nvr"]
cmd = nvr -s -d $LOCAL $REMOTE

[mergetool "nvr"]
cmd = nvr -s -d $LOCAL $BASE $REMOTE $MERGED -c 'wincmd J | wincmd ='

[grep]
linenumber = true


Loading…
Cancel
Save