# aliases
alias grep='grep --color'
alias ec="$EDITOR"
alias psc='ps xawf -eo pid,user,cgroup,args'
alias gcm='git checkout master && git fetch upstream && git reset --hard upstream/master && git push'
alias cdp='cd $HOME/git/te/puppet/'

alias df='df -h -x none'
alias free='free -m'
alias c='cd; clear'
alias ls='ls -b -CF --color=auto'
alias l=ls
alias ll='ls -lS'
alias dir='ls -lha'
alias du='du -h'
alias cal='cal -3'
alias edit=$EDITOR
alias e=$EDITOR
alias mtr='mtr --curses'