# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1307491906 25200
# Node ID c9577c9af6311dec0f5d4f7fc5cae4ea223d2763
# Parent  31a41264d51f6e1df3d5141bc5b81b506d4763f5
add a command for the alias i always forget

diff -r 31a41264d51f -r c9577c9af631 .bashrc
--- a/.bashrc	Tue May 31 15:34:36 2011 -0700
+++ b/.bashrc	Tue Jun 07 17:11:46 2011 -0700
@@ -28,7 +28,6 @@
 alias grep='grep --colour=auto'
 alias wget='wget --no-check-certificate'
 alias datestamp='date +%Y%m%d%H%M%S'
-alias zfilt='grep -v "eprecat" | grep -v "ERROR Zope"'
 alias svnst='svn st | grep -v "^\?"'
 alias awd="python -c 'import os;  print os.path.realpath(\".\")'"
 alias distribute='python setup.py egg_info -RDb "" sdist register upload'
@@ -61,6 +60,10 @@
     emacs +`wc -l "$FILE"` $@
 }
 
+git-diff-master() {
+git diff $(git merge-base HEAD master)
+}
+
 function colors() {
 
     CLR_WHITE="\033[0;37m"