git aliases

[alias]
  co = checkout

  ci = commit
  cim = commit --amend

  cp = cherry-pick
  cpc = cherry-pick --continue

  st = status

  ec = config --global -e

  di = diff -U8 -w
  dic = diff --cached -U8 -w
  dio = !git diff -U8 -w origin/$(git br)
  dim = diff -w origin/master

  up = !git fetch && git pull --rebase --prune

  sk = stash --keep-index

  cob = checkout -b
  com = checkout master

  cm = !git add -A && git commit -m
  wip = commit -m 'WIP'

  undo = reset HEAD~1 --mixed

  amend = commit -A --amend

  ri = rebase -i
  rc = rebase --continue
  ra = rebase --abort

  unfuck = !git reset --hard origin/$(git br)

  suc = !git branch --set-upstream-to=origin/$(git br) $(git br)

  br = !git rev-parse --abbrev-ref HEAD
  bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
  bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"

  release-notes = shortlog -p master --not origin/production

[github]
        user = aosalias
        email = [email protected]
[user]
        email = [email protected]
        name = Adam Olsen
[push]
        default = current
[pull]
        default = current
[core]
        excludesfile = ~/.gitignore
[rebase]
        instructionFormat = (%an) %s