summaryrefslogtreecommitdiff
path: root/themes/michelebologna.zsh-theme
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-09-28 08:52:03 -0400
committerAndrew Janke <andrew@apjanke.net>2015-09-28 08:52:03 -0400
commite4fdb083655fc582ebcecb07cd1bd1130077f0e4 (patch)
treefee07d9adfee79d1c88206ead154a23520ac51cb /themes/michelebologna.zsh-theme
parent5c8b0cc0c1782b34790548498018fb9e0300992b (diff)
parentb05ef1034fffd7b0c29f1558a8a357ccce7ae74b (diff)
downloadzsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.gz
zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.bz2
zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.zip
Merge branch 'master' into copyfile-portability
Diffstat (limited to 'themes/michelebologna.zsh-theme')
-rw-r--r--themes/michelebologna.zsh-theme15
1 files changed, 8 insertions, 7 deletions
diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index fec243873..110e3f203 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -59,16 +59,17 @@ ZSH_THEME_GIT_PROMPT_PREFIX=""
ZSH_THEME_GIT_PROMPT_SUFFIX=""
ZSH_THEME_GIT_PROMPT_DIRTY=""
ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
-ZSH_THEME_GIT_PROMPT_MODIFIED="*"
-ZSH_THEME_GIT_PROMPT_ADDED="+"
-ZSH_THEME_GIT_PROMPT_STASHED="$"
-ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="="
+ZSH_THEME_GIT_PROMPT_UNTRACKED="$blue%%"
+ZSH_THEME_GIT_PROMPT_MODIFIED="$red*"
+ZSH_THEME_GIT_PROMPT_ADDED="$green+"
+ZSH_THEME_GIT_PROMPT_STASHED="$blue$"
+ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="$green="
ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">"
ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="<"
-ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="<>"
+ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="$red<>"
PROMPT='$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)'
-PROMPT+='$(__git_ps1)'
+GIT_PROMPT='$(out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status);if [[ -n $out ]]; then printf %s " $white($green$out$white)$reset";fi)'
+PROMPT+="$GIT_PROMPT"
PROMPT+=" $last_command_output%#$reset "
RPROMPT=''