Newer
Older
dotfiles / git / gitconfig.symlink
@Marcus Bengtsson Marcus Bengtsson on 25 Sep 2015 496 bytes Added scala plugin for vim
[core]
	excludesfile = /Users/marcusbengtsson/.gitignore_global
[difftool "sourcetree"]
	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
	trustExitCode = true
[user]
	name = Marcus Bengtsson
	email = marcus.bengtsson@hiq.se
[diff]
	tool = kdiff3
[difftool]
	prompt = false
[merge]
	tool = kdiff3