.gitconfig

[user]
  name            =  Carl Hall
  email           =  [email protected]
[rerere]
  enabled         =  1
[core]
  excludesfile    =  /Users/carl/.gitignore_global
  pager           =  less -r
[color]
  ui              =  auto
  diff            =  auto
  branch          =  auto
  status          =  auto
[color "diff"]
  meta            =  yellow
  frag            =  cyan
  old             =  red
  new             =  green
  whitespace      =  red reverse
[color "status"]
  added           =  green
  changed         =  yellow
  untracked       =  cyan
[push]
	default = simple
[diff]
  tool            =  vimdiff
  algorithm       =  patience
[merge]
  tool            =  vimdiff
[alias]
  tree            =  log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
  delete          =  !sh -c 'git push "$0" :refs/heads/"$1"' # delete remote branch with git delete foo
  ours            =  "!f() { git checkout --ours $@ && git add $@; }; f"
  theirs          =  "!f() { git checkout --theirs $@ && git add $@; }; f"
  co              =  checkout
  fo              =  fetch origin --prune --tags
  recent-branches =  for-each-ref --sort=-committerdate --count=5 --format='%(refname:short)' refs/heads/
  lolcommit       =  !curl -s http://whatthecommit.com/ | grep \"<p>\" | sed 's/^...//' | git commit -F -
  pr              =  !git push origin $(git rev-parse --abbrev-ref HEAD) && open http://github.com/cloudability/$(basename $(git rev-parse --show-toplevel))/compare/master...$(git rev-parse --abbrev-ref HEAD)?expand=1
  lasttag         =  !git describe --tags `git rev-list --tags --max-count=1`
  up              =  !git stash save 'Preparing for code update' && git pull --rebase && git stash pop && echo 'Success!'
  prod            =  !curl https://app.cloudability.com/sha
  reset-master    =  !git fetch --prune --tags origin && git checkout -b new_master origin/master && git branch -m master old_master && git branch -m new_master master
  mrclean         =  !git branch --merged master | grep -v \"\\*\\|master\" | xargs -n 1 git branch -d
[github]
  user            =  thecarlhall

[mergetool]
  prompt          = false
  keepBackup      = false
  keepTemporaries = false