Browse code

Merge pull request #226 from sunaku/fishy

Fishy theme - better Git integration

Robby Russell authored on 26/05/2011 at 08:10:26
Showing 1 changed files
... ...
@@ -3,7 +3,18 @@
3 3
 local user_color='green'; [ $UID -eq 0 ] && user_color='red'
4 4
 PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
5 5
 PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
6
-RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
7 6
 
8
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
9
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
7
+local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
8
+RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
9
+
10
+ZSH_THEME_GIT_PROMPT_PREFIX=" "
11
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
12
+ZSH_THEME_GIT_PROMPT_DIRTY=""
13
+ZSH_THEME_GIT_PROMPT_CLEAN=""
14
+
15
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"
16
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
17
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
18
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
19
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
20
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"