dotfiles/.gitconfig_includes.common
Cyryl Plotnicki-Chudyk 90570dc4f5 splice mergetool added
2015-01-28 22:39:37 +01:00

29 lines
524 B
Plaintext

[user]
name = Cyryl Plotnicki-Chudyk
email = cyplo@cyplo.net
[color]
ui = true
[help]
autocorrect = 1
[push]
default = simple
[core]
pager = cat
[alias]
tree = log --show-signature --color --decorate --date=short --all --graph -n 9
[core]
autocrlf = false
[diff]
tool = vimdiff
[difftool]
prompt = false
[merge]
tool = kdiff3
[mergetool]
keepBackup = false
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true