Merge remote-tracking branch 'robby/master'

Conflicts:
	themes/ys.zsh-theme
This commit is contained in:
Yad Smood 2014-01-15 11:27:15 +08:00
commit fdbbd29b8f
93 changed files with 2733 additions and 318 deletions

View file

@ -7,13 +7,12 @@
# Mar 2013 ys
# Git Info
local git_info='$(git_prompt_info)'
ocal git_info='$(git_prompt_info)'
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
: <<'FORMAT'
Prompt format: