Mercurial > hg > config
diff .bashrc @ 144:c9577c9af631
add a command for the alias i always forget
| author | Jeff Hammel <jhammel@mozilla.com> |
|---|---|
| date | Tue, 07 Jun 2011 17:11:46 -0700 |
| parents | dc3c8f90a418 |
| children | 700b43d5052e |
line wrap: on
line diff
--- 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"