merge upstream

This commit is contained in:
James Cox 2009-09-23 16:14:04 +01:00
commit fdffd77e9c
13 changed files with 150 additions and 29 deletions

View file

@ -10,6 +10,7 @@ alias .='pwd'
alias ...='cd ../..'
alias _='sudo'
alias ss='sudo su -'
#alias g='grep -in'
@ -26,7 +27,10 @@ alias gba='git branch -a'
alias history='fc -l 1'
alias ls='ls -F'
alias ll='ls -al'
alias ll='ls -alr'
alias l='ls'
alias ll='ls -l'
alias sl=ls # often screw this up
alias sgem='sudo gem'