.gitconfig

[merge]
  tool = opendiff
[core]
  excludesfile = /Users/trevorhartman/.gitignore
  editor = vim
[alias]
  st = status -sb
  ci = commit
  co = checkout
  br = branch
  sb = show-branch
  dt = difftool
  pu = push
  cia = commit -a --amend

  # log variations
  hist = log --pretty=format:\"%h %Cgreen%ad%Creset %s%d [%an]\" --graph --date=short
  hi = !git hist --since=1.week.ago
  week = !git hi
  today = !git hist --since=1.day.ago
  last = !git --no-pager hi -n1

  tree = log --oneline --decorate --graph
  cp = cherry-pick
  a = add -A

  # since master
  sm = log master.. --pretty=oneline --graph --date=short --abbrev-commit

  # tags sorted by date
  t = for-each-ref --sort='*authordate' --format='%(tag)' refs/tags


  # git svn
  sr = svn rebase
  sd = svn dcommit

  # logs
  l1 = log --pretty=oneline
  ls = log --stat
  lg = log --graph
  root = !pwd

  # vimdiff = "difftool -y -t mvimdiff"
[color]
  ui = auto
[user]
  name = Trevor Hartman
  email = [email protected]
[difftool]
  prompt = false
[difftool "mvim"]
  cmd = "mvimdiff $LOCAL $REMOTE"
[diff]
  tool = mvim
[push]
  default = tracking