.gitconfig

[user]
  name = Richard Heycock
  email = rgh@filterfish.org

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

[alias]
  a    = add
  ap   = add --patch
  c    = commit
  ca   = commit --amend -C HEAD
  dd   = diff
  ddi  = diff --cached
  dds  = diff --stat
  ds   = "!f() { n=${1:-0}; [ $(git stash list | wc -l) -gt 0 ] && git diff stash@{$n}~1..stash@{$n}; }; f"
  dss  = "!f() { n=${1:-0}; [ $(git stash list | wc -l) -gt 0 ] && git diff --stat stash@{$n}~1..stash@{$n}; }; f"
  st   = status
  stu  = status --untracked-files=no
  ss   = stash save
  sp   = stash pop
  co   = checkout
  root = !pwd
  ll   = log
  ls   = log --graph --pretty=format:'%C(yellow)%h%Creset%C(cyan)%d%Creset %s %Cgreen(%cr)%Creset %C(white)<%an>%Creset'
  lsa  = log --graph --pretty=format:'%C(yellow)%h%Creset%C(cyan)%d%Creset %s %Cgreen(%cr)%Creset %C(white)<%an>%Creset' --all
  pr    = reflog --pretty=format:'%C(yellow)%h%Creset%C(cyan)%Creset %gd %gs %Cgreen(%cr)%Creset %C(white)%Creset'
  r     = remote -v
[push]
  default = simple
[diff]
  tool = meld
  algorithm = patience
[difftool]
  prompt = false
[merge]
  tool = meld
  algorithm = patience
  ff-only = true
[mergetool]
  prompt = false
  tool = meld
  algorithm = patience
[rerere]
  enabled = true
[core]
  pager = less -+S
[pull]
  rebase = true