Differences

This shows you the differences between two versions of the page.

--- bashrc [2009/11/28 16:53] – 92.195.113.39
+++ bashrc [2010/04/21 14:31] – 91.64.124.84
@@ Line 29: / Line 29: @@
   alias ll='ls -l'
   alias la='ls -A'
   alias l='ls -la'
+  export GREP_OPTIONS='--color=auto'
   # color in man pages http://icanhaz.com/colors
@@ Line 47: / Line 48: @@
   # cleanup firefox 3 dbs
   alias ffclean='for f in ~/.mozilla/firefox/*/*.sqlite; do echo $f; sqlite3 $f "VACUUM;"; done'
+  # current git branch for prompt below
+  # http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/
+  parse_git_branch() {
+    git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\[\1\]/'
+  }
   # set a fancy prompt and xterm title
@@ Line 54: / Line 61: @@
       PS1="\[\033]2;\w\007\]\[\033[0;31m\]\u@\h:\w\\$\[\033[0;37m\] "
     else
-      PS1="\[\033]2;\w\007\]\[\033[0;32m\]\u@\h:\w\\$\[\033[0;37m\] "
+      PS1='\[\033]2;\w\007\]\[\033[0;32m\]\u@\h\[\033[00;35m\]$(parse_git_branch)\[\033[0;32m\]:\w\\$\[\033[0;37m\] '
     fi
   else