summaryrefslogtreecommitdiff
path: root/themes/fishy.zsh-theme
diff options
context:
space:
mode:
authorRoman Kamyk <roman.kamyk@gmail.com>2011-09-15 12:56:40 +0200
committerRoman Kamyk <roman.kamyk@gmail.com>2011-09-15 12:56:40 +0200
commit2b55ee07534ec34a699805dc35ca83ad8e22fc7a (patch)
tree97f464ca865626aea1aa135e7eb9f629f4017171 /themes/fishy.zsh-theme
parentf71647fa85267d558d0d69034902f53aeeed67ad (diff)
parent762b55bb2bc0452ce3f5f2f21bc22b61936ef704 (diff)
downloadzsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.gz
zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.bz2
zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.zip
Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'themes/fishy.zsh-theme')
-rw-r--r--themes/fishy.zsh-theme17
1 files changed, 14 insertions, 3 deletions
diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index f22eda868..f9e506cae 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -3,7 +3,18 @@
local user_color='green'; [ $UID -eq 0 ] && user_color='red'
PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
-RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
+RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$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_bold[green]%}+"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"