aliases

alias g='git'
alias ga='git add'
alias gb='git branch -vv'
alias gbc='git branch -r --contains'
alias gbr='git branch -r'
alias gc='git cherry -v origin/master'
alias gca='git commit --amend'
alias gcm='git commit'
alias gco='git checkout'
alias gm='git commit -m'
alias gd='git diff'
alias gds='git diff --staged'
alias gfe='git fetch'
alias gfh='git flathist'
alias gh='git hist'
alias gl='git log'
alias gff='git merge --ff-only @{u}'
alias gpu='git pull'
alias gp='git push'
alias gr='git reset'
alias gru='git remote update'
alias gruff='gru && gff'
alias gs='git status'
alias gsh='git show'
alias gsm='git submodule'
alias gsmu='git submodule update'
alias gst='git status'
alias mvim='/Applications/MacVim.app/Contents/MacOS/Vim -g'

alias fu='kill'
alias fuu='kill -9'
alias fuuu='killall'
alias fuuuu='killall -9'

# Why yes, my dear Pakleds, we can make colours go.
alias grep='grep --color=auto'
UNAME=`uname`
if [ "$UNAME" != "Darwin" ]; then
    alias ls='ls --color=auto'
else
    alias ls='ls -G'
fi

count-folder-files() {
    OIFS=$IFS
    IFS=$'\n'
    for p in `ls -1`; do
        echo "$p: `find "$p" | wc -l`"
    done
    IFS=$OIFS
}


if [ -f ~/configs/custom_aliases ]; then
    . ~/configs/custom_aliases;
fi