Created
April 20, 2010 19:28
-
-
Save raine/372935 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alias gdc='git diff --cached' | |
alias gst='git status -s' # git >1.7.0 | |
alias glr='git pull --rebase' | |
alias gl='git pull' | |
alias gp='git push' | |
alias gd='git diff' | |
alias gc='git commit -v' | |
alias gca='git commit -v -a' | |
alias gb='git branch' | |
alias gba='git branch -a' | |
alias gap='git add --patch' | |
alias glg="git log --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" | |
alias gsa='git stash apply' | |
alias gs='git stash' | |
RED="\[\033[0;31m\]" | |
YELLOW="\[\033[0;33m\]" | |
GREEN="\[\033[0;32m\]" | |
BLUE="\[\033[0;34m\]" | |
LIGHT_RED="\[\033[1;31m\]" | |
LIGHT_GREEN="\[\033[1;32m\]" | |
WHITE="\[\033[1;37m\]" | |
LIGHT_GRAY="\[\033[0;37m\]" | |
COLOR_NONE="\[\e[0m\]" | |
function parse_git_branch { | |
git rev-parse --git-dir &> /dev/null | |
git_status="$(git status 2> /dev/null)" | |
branch_pattern="^# On branch ([^${IFS}]*)" | |
detached_branch_pattern="# Not currently on any branch" | |
remote_pattern="# Your branch is (.*) of" | |
diverge_pattern="# Your branch and (.*) have diverged" | |
if [[ ${git_status}} =~ "Changed but not updated" ]]; then | |
state="${RED}⚡" | |
fi | |
# add an else if or two here if you want to get more specific | |
if [[ ${git_status} =~ ${remote_pattern} ]]; then | |
if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then | |
remote="${YELLOW}↑" | |
else | |
remote="${YELLOW}↓" | |
fi | |
fi | |
if [[ ${git_status} =~ ${diverge_pattern} ]]; then | |
remote="${YELLOW}↕" | |
fi | |
if [[ ${git_status} =~ ${branch_pattern} ]]; then | |
branch=${BASH_REMATCH[1]} | |
elif [[ ${git_status} =~ ${detached_branch_pattern} ]]; then | |
branch="${YELLOW}NO BRANCH" | |
fi | |
if [[ ${#state} -gt "0" || ${#remote} -gt "0" ]]; then | |
s=" " | |
fi | |
echo " ${branch}${s}${remote}${state}" | |
} | |
function prompt_func() { | |
git rev-parse --git-dir > /dev/null 2>&1 | |
if [ $? -eq 0 ]; then | |
prompt="${TITLEBAR}${BLUE}[${RED}\W${GREEN}$(parse_git_branch)${BLUE}]${COLOR_NONE} " | |
PS1="${prompt}$ " | |
else | |
PS1=$PSAVE | |
fi | |
} | |
export PSAVE=$PS1 | |
PROMPT_COMMAND=prompt_func | |
source ~/.git-completion.bash |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment