Skip to content

Commit

Permalink
updated prompt for git
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Kober committed Dec 11, 2013
1 parent 214c75e commit 4656f85
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion awesome
14 changes: 7 additions & 7 deletions bashrc
Expand Up @@ -25,8 +25,8 @@ alias ssh='$HOME/bin/askpass; ssh'
export EDITOR='vim'
export VISUAL='gvim'

# privoxy as proxyserver
export http_proxy=http://127.0.0.1:8118/
## privoxy as proxyserver
#export http_proxy=http://127.0.0.1:8118/

# export GNU_PG for vim
export GPG_TTY=`tty`
Expand Down Expand Up @@ -73,13 +73,13 @@ LIGHT_GREEN="\[\033[1;32m\]"
function parse_git_branch {
git rev-parse --git-dir &> /dev/null
git_status="$(LANG=en_US.UTF-8; git status 2> /dev/null)"
branch_pattern="^# On branch ([^${IFS}]*)"
remote_pattern="# Your branch is (.*) of"
diverge_pattern="# Your branch and (.*) have diverged"
branch_pattern="^On branch ([^${IFS}]*)"
remote_pattern="Your branch is (.*) of"
diverge_pattern="Your branch and (.*) have diverged"
if [[ ! ${git_status} =~ "working directory clean" ]]; then
if [[ ${git_status} =~ "# Changes to commited" ]]; then
if [[ ${git_status} =~ "Changes to commited" ]]; then
state="${RED}"
elif [[ ${git_status} =~ "# Changes not staged for commit" ]]; then
elif [[ ${git_status} =~ "Changes not staged for commit" ]]; then
state="${RED}"
else
untracked="${LIGHT_RED}*"
Expand Down

0 comments on commit 4656f85

Please sign in to comment.