gitconfig

[filter "media"]
	required = true
	clean = git media clean %f
	smudge = git media smudge %f
[user]
	name = Stew Wilson
	email = stew.wilson@ed.ac.uk
[push]
	default = simple
        followTags = true
[filter "lfs"]
	clean = git-lfs clean %f
	smudge = git-lfs smudge %f
	required = true
[advice]
	statusHints = false
	pushNonFastForward = false
[color]
	ui = auto
[branch]
	autosetupmerge = true
[credential]
	helper = osxkeychain
[core]
	excludesfile = ~/.gitignore
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
	prompt = false
[diff]
	tool = Kaleidoscope
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool]
	prompt = false
[merge]
	tool = Kaleidoscope
[pull]
	rebase = false