[core]
	excludesfile = /Users/marcusbengtsson/.gitignore_global
[user]
	name = Marcus Bengtsson
	email = marcus.bengtsson@elysics.se
[init]

[alias]
	tree = log --oneline --decorate --all --graph
	pulls = !git pull && git submodule init && git submodule update && git submodule status
	psup = !git pull && git submodule update --init --recursive && git submodule status
    unadd = reset HEAD
[status]
	submodulesummary = true
[push]
	default = simple

[merge]
	tool = kdiff3
[mergetool "kdiff3"]
	trustExitCode = false
[mergetool]
	prompt = false
[diff]
	guitool = kdiff3
	tool = kdiff3
[difftool "kdiff3"]
	trustExitCode = false
[difftool]
	prompt = false