gistfile1

# some more ls aliases
alias ll='ls -l'
alias la='ls -A'
alias l='ls -CF'

alias remote-print='ssh -L 9100:192.168.1.6:9100 [email protected]'

# Courtesy of http://ozmm.org/posts/git_bash_aliases.html
alias gb='git branch -a -v'
alias gs='git status'
alias gd='git diff'
alias gg='git gui &'
alias gl='git log --name-status'
alias ga='git add'
alias gcommit='git commit -m'
alias gp='git push'
alias sudop='sudo env http_proxy=http://www-proxy.us.oracle.com/'
alias f='open -a Finder $1'
alias rr='touch tmp/restart.txt'
alias proxyon='source ~/scripts/proxyon.sh'
alias proxyoff='source ~/scripts/proxyoff.sh'
alias vpnon='sudo vpnclient connect AmericasWest && proxyon'
alias vpnoff='proxyoff && sudo vpnclient disconnect'
alias von='eval ~/scripts/von'
alias vim='/Applications/MacVim.app/Contents/MacOS/Vim'
alias gvim='vim -g'
alias sshp='ssh -o ProxyCommand "/opt/local/bin/corkscrew www-proxy.us.oracle.com 80 %h %p"'
alias sshconnect="ssh [email protected]"
alias sshapps3root="ssh [email protected]"
alias sshapps3oracle="ssh [email protected]"
alias sshapps3appslab="ssh [email protected]"
alias sshapps2git="ssh [email protected]"
alias sshapps2appslab="ssh [email protected]"
alias sshmix1="ssh [email protected]"
alias sshmix2="ssh [email protected]"
alias sshmix3="ssh [email protected]"
alias vi='vim'
# gc      => git checkout master
# gc bugs => git checkout bugs
function gc {
  if [ -z "$1" ]; then
    git checkout master
  else
    git checkout $1
  fi
}

function skill { 
  ps ax | grep $1 | grep -v grep;
  kill -9 `ps ax | grep $1 | grep -v grep | awk '{print $1}'`;
}

function pgrep { 
  ps ax | grep $1 | grep -v grep;
}

export PS1='[\w$(__git_ps1 "(%s)")] '