.gitconfig

[http]
[core]
	excludesfile = /Users/steve/.gitignore_global
	editor = code --wait
[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE
[merge]
  tool = meld
[mergetool]
  prompt = false
[mergetool "meld"]
  trustExitCode = true
  cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"
[user]
	name = Steve Bargelt
	email = steve@bargelt.com
[push]
	default = matching
[alias]
	co = checkout
	up = !git pull --rebase --prune
	ec = config --global -e
	cob = checkout -b
	cm = !git add -A && git commit -S -m
	save = !git add -A && git commit -m 'SAVEPOINT'
	wip = commit -am "WIP" 
	undo = reset HEAD~1 --mixed
	amend = commit -a --ame
	wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
	mmaster = !git checkout master && git merge --no-ff $@ && git push origin master
	bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
	bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"