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

kdiff3 as a default merge and diff tool on all platforms now

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-01-16 18:36:55 +01:00
parent 17b5fab08d
commit 415faed70e
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitconfig_includes.common
View file

@ -11,5 +11,15 @@
pager = cat pager = cat
[alias] [alias]
tree = log --show-signature --color --decorate --date=short --all --graph -n 9 tree = log --show-signature --color --decorate --date=short --all --graph -n 9
[core]
autocrlf = false
[diff]
tool = kdiff3
[difftool]
prompt = false
[merge]
tool = kdiff3
[mergetool] [mergetool]
keepBackup = false keepBackup = false