gitconfig

[user]
	name = Dave Harris
	email = dave@harris.org.nz
[core]
	pager = less -x4
	editor = sublime --wait
	excludesfile = /Users/dave/.gitignore_global
[color]
	diff = auto
	status = auto
	branch = auto
	interactive = auto
	ui = true
[alias]
	s = status
	st = status
	ci = commit
	co = checkout
	switch = checkout
	master = checkout master
	stable = checkout stable
	br = branch
	branches = branch
	cleanup = "! git fetch --prune && git branch --merged | grep  -v '\\*\\|master\\|develop\\|release\\|sprints' | xargs -n 1 git branch -d"
	lol = "log --pretty=oneline --abbrev-commit --graph --decorate"
	#lo = "log --oneline"
	lo = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
	changes="log HEAD...master"
	stat = "log -n 1 --stat"
	current-branch = "!echo $(git branch --no-color 2> /dev/null | grep \"*\" | cut -d \" \" -f 2)"
	incoming = "!git fetch && git --no-pager log --format=format:'%C(yellow)%h : %C(red)%an : %C(green)%cr : %C(reset)%s' --decorate ..origin/$(git current-branch) && echo \"\n\""
	outgoing = "!git fetch && git --no-pager log --format=format:'%C(yellow)%h : %C(red)%an : %C(green)%cr : %C(reset)%s' --decorate origin/$(git current-branch..) && echo \"\n\""
	rm-orig = "!find . -type f -name *.orig -delete"
	diff-stash = "stash show -p stash@{0}"
	publish = "push -u"
	zip = "!git archive HEAD --format=zip > archive.zip"
	deploy-message="!git log --format=%s `git rev-parse --symbolic-full-name --abbrev-ref master@{u}`.."
[merge]
	tool = meld
[mergetool "p4merge"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
[mergetool]
	keepBackup = false
	tool = p4merge
[branch]
	autosetupmerge = true
	autosetuprebase = always
[push]
	default = upstream
[gui]
	fontui = -family droid -size 4 -weight bold -slant roman -underline 0 -overstrike 0
	fontdiff = -family droid -size 4 -weight normal -slant roman -underline 0 -overstrike 0
[credential]
	helper = osxkeychain