bashrc-git

COLOR_RESET="\[\033[0;39;49m\]"
COLOR_BRANCH="\[\033[0;1;32;44m\]"
COLOR_REPO="\[\033[0;1;33;44m\]"
COLOR_WORKDIR="\[\033[0;1;33;42m\]"
MOD_GLYPH="*"
STATE_GLYPH="|"
PS1_GLYPH="\$"

# shamelessly ripped off from http://github.com/rtomayko/git-sh/tree/master
# ... and Ubuntu's __git_ps1() in /etc/bash_completion.d/git
_git_prompt_color() {
    local g r b rel loc mod

    g="$(git rev-parse --git-dir 2>/dev/null)"
    if [ -z $g ]; then
        export BASH_GIT_BRANCH=""
        PS1="\u@\h:\w$PS1_GLYPH "
        return
    fi

    if [ -d "$g/../.dotest" ]
    then
        if test -f "$g/../.dotest/rebasing"
        then
            r="${STATE_GLYPH}REBASE"
        elif test -f "$g/../.dotest/applying"
        then
            r="${STATE_GLYPH}AM"
        else
            r="${STATE_GLYPH}AM/REBASE"
        fi
        b="$(git symbolic-ref HEAD 2>/dev/null)"
    elif [ -f "$g/.dotest-merge/interactive" ]
    then
        r="${STATE_GLYPH}REBASE-i"
        b="$(cat "$g/.dotest-merge/head-name")"
    elif [ -d "$g/.dotest-merge" ]
    then
        r="${STATE_GLYPH}REBASE-m"
        b="$(cat "$g/.dotest-merge/head-name")"
    elif [ -f "$g/MERGE_HEAD" ]
    then
        r="${STATE_GLYPH}MERGING"
        b="$(git symbolic-ref HEAD 2>/dev/null)"
    else
        if [ -f "$g/BISECT_LOG" ]
        then
            r="${STATE_GLYPH}BISECTING"
        fi
        if ! b="$(git symbolic-ref HEAD 2>/dev/null)"
        then
            if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
            then
                b="$(cut -c1-7 "$g/HEAD")..."
            fi
        fi
    fi

    b="${b##refs/heads/}" # make it a pretty name
    export BASH_GIT_BRANCH="$b"

    mod=`git ls-files --modified --deleted --others --exclude-standard 2>/dev/null | head -1`
    if [ ! -z "$mod" ]; then
        r="${MOD_GLYPH}$r"
    fi

    rel=$(git rev-parse --show-prefix 2>/dev/null)
    rel="${rel%/}"
    loc="${PWD%/$rel}"

    PS1="\u@\h:${COLOR_BRANCH}${b}${r}${COLOR_RESET}!${COLOR_REPO}${loc/*\/}${COLOR_RESET}${COLOR_WORKDIR}${rel:+/$rel}${COLOR_RESET}${PS1_GLYPH} "
}

###############################################################################
# Use the fancy Git prompt
PROMPT_COMMAND=_git_prompt_color

###############################################################################
whatgitbranch() {
    local branch
    branch="$(git symbolic-ref HEAD 2>/dev/null)"
    branch="${branch##refs/heads/}"
    echo "$branch"
}

gunpushed() {
    local branch
    branch=$(whatgitbranch)
    set -x
        git log --pretty=oneline "origin/$branch.."
    set +x
}

gunpulled() {
    local branch
    branch=$(whatgitbranch)
    set -x
        git log --pretty=oneline "..origin/$branch"
    set +x
}

makebranch() {
    local branch gitdir
    branch=$1
    gitdir=$(git rev-parse --git-dir 2>/dev/null)
    if [ -e "$gitdir/refs/heads/$branch" ]; then
        # ERROR: branch exists locally
        echo "branch '$branch' exists locally; can't create new branch"
    else
        git fetch
        if [ -e "$gitdir/refs/remotes/origin/$branch" ]; then
            # ERROR: branch exists remotely
            echo "branch '$branch' exists remotely; can't create new branch"
        else
            set -x
                git branch $branch
                git push --set-upstream origin $branch
                git checkout $branch
            set +x
        fi
    fi
}

gpu() {
    local branch gitdir
    branch="$(whatgitbranch)"
    set -x
        git push origin $branch
    set +x
}

setbranch() {
    local branch gitdir
    branch=$1
    gitdir=$(git rev-parse --git-dir 2>/dev/null)
    if [ -e "$gitdir/refs/heads/$branch" ]; then
        git checkout $branch
    else
        git fetch
        if [ -e "$gitdir/refs/remotes/origin/$branch" ]; then
            git checkout --track -b $branch origin/$branch
        else
            echo "branch '$branch' doesn't exist; did you want to 'makebranch'?"
        fi
    fi
}

alias gst='git status'
alias gd='git diff'
alias gdc='git diff --cached'
alias glol='git log --pretty=oneline'
alias glop='git log -p -1'
alias gci='git commit --verbose'
alias gup='git pull --rebase'
alias gbr='git branch -vv'