Git config

.gitconfig

[core]
  editor = vim
  excludesfile = ~/.gitignore
[user]
  name = Tim Heuett
  email = tim.heuett@gmail.com
[push]
  default = simple
[credential]
  helper = osxkeychain
[alias]
  br = branch -a
  c = commit -m
  ca = commit --amend --reuse-message=HEAD
  cam = commit --amend -m
  co = checkout
  df = diff
  dfs = diff --staged
  dt = diff-tree --name-status -r
  la = log --patch --stat --pretty=format:\"%C(bold red)%h %Cgreen%cr %Cblue%cn%C(yellow)%d %Creset%s\"
  ll = log --pretty=format:\"%Cred%h %>(11,trunc)%Cgreen%cr %<(10,trunc)%Cblue%cn%C(yellow)%d %Creset%s\"
  mm = merge -m
  p = pull
  rb = rebase
  rba = rebase --abort
  rbc = rebase --continue
  rbi = rebase -i
  st = status --short --branch
  u = merge --no-commit --ff-only

For la and ll I've always been using tig command — that is curses git frontend.
I recommend it for everyone.

Very neat! Thanks for the recommendation, @timurb 👍

This gist is no longer in use -- check out https://github.com/timhugh/dotfiles for the up-to-date version