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

vimdiff as a default difftool everywhere

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-03-16 13:21:16 +01:00
parent bf44cdbd18
commit 80fce7dbaf
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitconfig_includes.common
View file

@ -14,16 +14,11 @@
head = log HEAD -n1 head = log HEAD -n1
[core] [core]
autocrlf = false autocrlf = false
[diff] [diff]
tool = kdiff3 tool = vimdiff
[difftool] [difftool]
prompt = false prompt = false
[merge] [merge]
tool = kdiff3 tool = kdiff3
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true

17
.gitconfig_includes.cygwin
View file

@ -1,17 +1,2 @@
[difftool "kdiff3"]
path = kdiff3.sh
trustExitCode = false
[difftool]
prompt = false
[diff]
tool = kdiff3
[mergetool "kdiff3"]
path = kdiff3.sh
trustExitCode = false
keepBackup = false
[merge]
tool = kdiff3
[core] [core]
autocrlf = false autocrlf = true