gitconfig

[user]
  name = Ian Vaughan
  email = github@ianvaughan.co.uk

[alias]
  co = checkout
  ci = commit --verbose
  amend = commit --amend
  br = branch
  st = status
  ri = rebase -i --autosquash
  
  # graph log of head branch
  l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(yellow)%an%Creset' --abbrev-commit --date=relative
  # graph log of all branches
  la = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(yellow)%an%Creset' --abbrev-commit --all --date=relative
  d = diff
  dc = diff --cached
  #ds = diff --stat=160,120
  #dh1 = diff HEAD~1
  dm = !git l ...master -p
  shas = log ...master --pretty=format:"%H"
  # rshas = !git --no-pager log ...master --pretty=format:"%H"; echo "" | tail -r

  head = !git l -1
  h = !git head
  # r = recent commits, only current branch
  r = !git l -30
  # ra = recent commits, all reachable refs
  ra = !git r --all
  # la = all commits, all reachable refs
  la = !git l --all
  
  # open vim at conflicts
  vc = "!vim +/'<<<<<<' `git st -s | grep UU | sed 's/UU //'`"

[color]
  ui = true
  diff = auto
  status = auto
  branch = auto
  interactive = auto

[push]
  default = current

[core]
	excludesfile = /Users/ianvaughan/.gitignore
  editor = vim
	autocrlf = input

[pager]
  stash = false
	diff = diff-so-fancy | less --tabs=4 -RFX
	show = diff-so-fancy | less --tabs=4 -RFX
	branch = false

[help]
	autocorrect = 1

[git-up "bundler"]
	check = true
  autoinstall = true
[git-up "rebase"]
	auto = false
[filter "lfs"]
	clean = git-lfs clean %f
	smudge = git-lfs smudge %f
	required = true
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
[git-up "fetch"]
	prune = true