2013-11-15 10:30:11 +00:00
|
|
|
[difftool "kdiff3"]
|
|
|
|
|
path = kdiff3
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[diff]
|
|
|
|
|
tool = kdiff3
|
|
|
|
|
[mergetool "kdiff3"]
|
|
|
|
|
path = kdiff3
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
keepBackup = false
|
|
|
|
|
[merge]
|
|
|
|
|
tool = kdiff3
|
2013-10-25 12:44:43 +01:00
|
|
|
|
2013-11-18 10:26:50 +00:00
|
|
|
[core]
|
|
|
|
|
autocrlf = true
|
2013-11-26 09:46:32 +00:00
|
|
|
[alias]
|
|
|
|
|
tree = log --oneline --decorate --all --graph -n 16
|
|
|
|
|
|
