gitconfig

[color]
    ui = auto
  [color "branch"]
    current = yellow reverse
    local = yellow
    remote = green
  [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
  [color "status"]
    added = yellow
    changed = green
    untracked = cyan
[user]
  name  = Andrew Johnstone
  email = andrew@ajohnstone.com
[github]
  user = ajohnstone
[hub]
  protocol = https
[advice]
  statusHints = true
[push]
  config = default
  default = tracking
[rebase]
	autosquash = true
[merge]
  summary = true

[alias]
  a   = add -u
  aa  = add -A
  ap  = add -u -p
  c   = commit -v
  co  = checkout
  d   = diff
  df  = diff
  ds  = diff --staged
  dw  = diff --color-words
  l = log --pretty='format:%C(yellow)%h%C(reset) %C(blue)%ad%C(reset) %s%C(red)%d%C(reset) %C(green)%an%C(reset), %C(cyan)%ar%C(reset)' --date=short
  lg = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  s   = status -s -b
  sm  = submodule
  smu = submodule foreach git pull origin master
  st  = status
  td  = merge --no-ff
  w   = whatchanged --decorate
  wp  = whatchanged --decorate -p
  pr  = "!f() { git fetch origin refs/pull/$1/head:pr/$1 && git co pr/$1; } ; f"
  up  = "!git fetch upstream && git rebase upstream/master"

[branch "master"]
    remote = origin
    merge = refs/heads/master