mandlm/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: use vim fugitive as mergetool

Browse source
This commit is contained in:
Michael Mandl 2022-02-21 15:22:47 +01:00
parent 4edfde63b0
commit ff9d284670
Signed by: mandlm
GPG key ID: 4AA25D647AA54CC7
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
git/gitconfig
View file

@ -32,17 +32,13 @@
old = red bold old = red bold
new = 64 new = 64
whitespace = red reverse whitespace = red reverse
[merge]
tool = fugitive
[mergetool] [mergetool]
keepBackup = false keepBackup = false
prompt = false prompt = false
[diff] [mergetool "fugitive"]
tool = vimdiff cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[difftool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
prompt = false
[gitflow] [gitflow]
multi-hotfix = true multi-hotfix = true
[gitflow "branch"] [gitflow "branch"]
@ -59,12 +55,6 @@
date = relative date = relative
[format] [format]
pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
[merge]
tool = nvim
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[mergetool "bc"]
path = /mnt/c/Program Files/Beyond Compare 4/BComp.exe
[rerere] [rerere]
enabled = true enabled = true
[fetch] [fetch]