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,15 @@
# Comment
# Comment
ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
ZSH_THEME_GIT_PROMPT_SUFFIX=')'
PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
PROMPT='%{$fg[magenta]%}[%c]$(vcs_prompt_info) $ %{$reset_color%}'
ZSH_THEME_GIT_PROMPT_PREFIX=""
ZSH_THEME_GIT_PROMPT_SUFFIX=""
ZSH_THEME_GIT_PROMPT_DIRTY=""
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"