Permalink
Browse files

Merge branch 'master' into gilt

  • Loading branch information...
2 parents c36bfdb + 5b1e3b0 commit 47271a01eb69a566e817b45a1e6d321988587f02 Louis Vera committed Apr 6, 2012
Showing with 0 additions and 3 deletions.
  1. +0 −3 .bashrc
View
@@ -1,6 +1,3 @@
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
export PS1='\u \w $(__git_ps1 "(%s)") $ '
export EDITOR=vim
export GREP_OPTIONS='--color=auto'

0 comments on commit 47271a0

Please sign in to comment.