dotfiles/.gitconfig_includes.common

30 lines
548 B
Text
Raw Normal View History

2013-11-16 21:10:36 +00:00
[user]
name = Cyryl Plotnicki-Chudyk
email = cyplo@cyplo.net
[color]
ui = true
[help]
autocorrect = 1
[push]
default = simple
2013-11-16 21:28:37 +00:00
[core]
pager = cat
2013-11-26 09:48:42 +00:00
[alias]
tree = log --show-signature --color --decorate --date=short --all --graph -n 9
head = log HEAD -n1
[core]
autocrlf = false
[diff]
tool = kdiff3
[difftool]
prompt = false
[merge]
tool = kdiff3
2014-02-03 13:39:12 +00:00
[mergetool]
keepBackup = false
2015-01-28 21:39:37 +00:00
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true