jay/dotter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modify gitconfig

Browse Source
This commit is contained in:
jay 2022-05-03 15:55:34 +08:00
parent a37ceaed83
commit a0d0f7b1a2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitconfig
View File

@ -9,7 +9,7 @@
tool = vimdiff tool = vimdiff
trustExitCode = true trustExitCode = true
[difftool] [difftool]
prompt = false prompt = true
[alias] [alias]
d = difftool d = difftool
co = checkout co = checkout
@ -20,6 +20,8 @@
br = branch br = branch
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[core] [core]
editor = vim editor = vim