summaryrefslogtreecommitdiff
path: root/themes/michelebologna.zsh-theme
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-09-19 15:07:36 -0400
committerAndrew Janke <andrew@apjanke.net>2015-09-19 15:07:36 -0400
commit6cddf7202b8ef5c2eb2dfc081d870dc9e751d646 (patch)
treebe3fe162edbc04946eea014a3612280d4909dc1e /themes/michelebologna.zsh-theme
parent82c76f6b5c2718622a532fb759231e8d24171413 (diff)
parentcbc1a0806e910f7b4eed07b992d3d88ff7cb1162 (diff)
downloadzsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.tar.gz
zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.tar.bz2
zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.zip
Merge branch 'master' into installer-portable-colors
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=''