dotfiles/.gitconfig_includes.common

[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
don't autocrlf on unix systems [oops] 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`
gitconfig: don't use pager 2013-11-16 21:28:37 +00:00			`[core]`
			`pager = cat`
move git tree alias to all platforms 2013-11-26 09:48:42 +00:00			`[alias]`
9 last commits shown by default using 'git tree' 2014-11-17 08:58:37 +00:00			`tree = log --show-signature --color --decorate --date=short --all --graph -n 9`
kdiff3 as a default merge and diff tool on all platforms now 2015-01-16 17:36:55 +00:00			`[core]`
			`autocrlf = false`


			`[diff]`
vimdiff added as a default difftool 2015-01-28 21:37:05 +00:00			`tool = vimdiff`
kdiff3 as a default merge and diff tool on all platforms now 2015-01-16 17:36:55 +00:00			`[difftool]`
			`prompt = false`
			`[merge]`
			`tool = kdiff3`
no backup files after merge 2014-02-03 13:39:12 +00:00			`[mergetool]`
			`keepBackup = false`
splice mergetool added 2015-01-28 21:39:37 +00:00			`[mergetool "splice"]`
			`cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"`
			`trustExitCode = true`