Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/git.zsh
	themes/Soliah.zsh-theme
	themes/theunraveler.zsh-theme
This commit is contained in:
Ryan Phillips 2011-05-26 10:42:39 -05:00
commit 1e709d00e7
89 changed files with 2552 additions and 134 deletions

View file

@ -1,6 +1,6 @@
# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \