Merge SJL's fork with upstream

Merge branch 'master' of https://github.com/sjl/oh-my-zsh

Conflicts:
	README.textile
	lib/git.zsh
	oh-my-zsh.sh
This commit is contained in:
Jeffrey Horn 2012-01-19 14:27:51 -05:00
commit 7bebacbb87
26 changed files with 1310 additions and 67 deletions

View file

@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
ZSH_THEME="robbyrussell"
export ZSH_THEME="random"
# Example aliases
# alias zshconfig="mate ~/.zshrc"