From e1fe13d0226b2b8aa259aee5c17cd70b9dc3bc86 Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Sun, 7 Oct 2012 22:09:36 -0700
Subject: [PATCH] Ignore whitespace in git diffs; a few aliases

---
 zsh/aliases.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 598574f..377ef8f 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -60,6 +60,8 @@ alias gm='git merge'
 alias gms='git merge --squash'
 alias gam='git amend --reset-author'
 alias grv='git remote -v'
+alias grr='git remote rm'
+alias grad='git remote add'
 alias gr='git rebase'
 alias gra='git rebase --abort'
 alias ggrc='git rebase --continue'
@@ -72,8 +74,8 @@ alias gf='git fetch'
 alias gfch='git fetch'
 alias gd='git diff'
 alias gb='git b'
-alias gbd='git b -D'
-alias gdc='git diff --cached'
+alias gbd='git b -D -w'
+alias gdc='git diff --cached -w'
 alias gpub='grb publish'
 alias gtr='grb track'
 alias gpl='git pull'
@@ -107,6 +109,7 @@ alias co='script/console --irb=pry' # Rails 2
 alias ts='thin start'
 alias ms='mongrel_rails start'
 alias tfdl='tail -f log/development.log'
+alias tftl='tail -f log/test.log'
 
 # Vim/ctags "mctags = make ctags", using the ruby specific version
 # to save some time