gitconfig

[user]
	name = Matt Chapman
	email = Matt@NinjitsuWeb.com
	mail = Matt@NinjitsuWeb.com
[core]
	editor = vim
  whitespace=fix,-indent-with-non-tab,-indent-with-tab,trailing-space,cr-at-eol
[push]
	default = simple
[merge]
  defaultToUpstream = true
[alias]
  st = status -sb -uno
  ll = log --pretty=format:'%C(yellow)%h %Cblue%ar %an%Cgreen%d %Creset%s'
  ls = log --name-status
  ci = commit
  br = branch -v
  bc = !git co master && git pull && git branch --merged | grep -v \"\\*\" | xargs -n 1 git branch -d && git remote prune origin && git gc --prune=now
  co = checkout
  unstage = reset HEAD
  df = !git diff && git diff --staged
  wd = diff --word-diff
  clear = reset --hard
  up = !git stash && git pull --rebase
  re = remote -v
  mergekeep = merge -s recursive -X ours
  keep = merge -s recursive -X ours
  mergetoss = merge -s recursive -X theirs
  toss = merge -s recursive -X theirs
  changelog = log --pretty=format:'%s by %an (%h)'
  uncommit = reset --soft HEAD^

[color]
  ui = auto

[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
  whitespace = red reverse

[branch]
	autosetuprebase = always