[user]
	email = alan@alanpearce.eu
	name = Alan Pearce
[color]
	branch = auto
	diff = auto
	status = auto
	ui = true
[push]
	default = current
[alias]
	up = merge FETCH_HEAD
	st = status -sb
	ci = commit
	br = branch
	co = checkout
	ready = rebase -i @{u}
	lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
	standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --since yesterday --author Alan
	ignored = ls-files --others -i --exclude-standard
	pr = pull-request
	delete-merged = "!sh -c 'git branch --merged | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d'"
[github]
	user = alan@alanpearce.eu
[ghq "ssh://alanpearce.eu/"]
  vcs = git
[includeIf "gitdir:github.com/Spotcap/"]
  path = config-spotcap
[includeIf "gitdir:bitbucket.org/spotcap-engineering/"]
  path = config-spotcap
[diff]
	algorithm = patience
[include]
	path = config.local
[rebase]
	autosquash = true
[rerere]
	enabled = true
[diff]
  tool = icdiff
[difftool]
  prompt = false
[difftool "icdiff"]
  cmd = icdiff --line-numbers $LOCAL $REMOTE