-

[user]
    name = John Sutherland
    email = john@sneeu.com

[alias]
    amend = commit --amend -C HEAD
    br = branch
    brdi = !git diff `git merge-base HEAD master`
    brdt = !git difftool `git merge-base HEAD master`
    ci = commit
    co = checkout
    di = diff
	lg = log --graph --decorate --color --all --format=format:\"%C(auto)%h %d %s [%cn]\"
    st = status -s

[core]
    excludesfile = ~/.gitignore
    quotepath = false
	editor = /Applications/MacVim.app/Contents/MacOS/Vim

[push]
    default = simple
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
	tool = Kaleidoscope
[difftool]
	prompt = false
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true
[mergetool]
	prompt = false
[merge]
	tool = Kaleidoscope
	ff = false
[filter "media"]
	clean = git-media-clean %f
	smudge = git-media-smudge %f