#standard shell aliases
alias ll='ls -l'
alias la='ls -a'
alias lhal='ls -hal'

#git aliases
alias ?='git status'
alias ga='git add'
alias gaa='git add .'
alias gco='git checkout'
alias gc='git commit'
alias gpush='git push'
alias gpull='git pull'
alias gdiff='git diff'
alias merged?='git branch --merged'
alias gbd='git branch -d'
alias gpush!='git push -u origin `git rev-parse --abbrev-ref HEAD`'
alias master!='git checkout master'