diff options
author | Robby Russell <robby@planetargon.com> | 2015-09-19 08:51:37 -0700 |
---|---|---|
committer | Robby Russell <robby@planetargon.com> | 2015-09-19 08:51:37 -0700 |
commit | 1324e6126c8924196fdc33d9f94527f9af3f3418 (patch) | |
tree | 716d7c4c3255ebecc5eb87c855f29629edbeae67 /themes/michelebologna.zsh-theme | |
parent | 763bf6374cf15162e6cea1528fb7d08c38037c65 (diff) | |
parent | 68b792bbb67958c726dd8ebe9cfe12f5e463d160 (diff) | |
download | zsh-1324e6126c8924196fdc33d9f94527f9af3f3418.tar.gz zsh-1324e6126c8924196fdc33d9f94527f9af3f3418.tar.bz2 zsh-1324e6126c8924196fdc33d9f94527f9af3f3418.zip |
Merge pull request #4050 from mbologna/michelebologna_fix_git_prompt
Change to use omz git_prompt* functions
Diffstat (limited to 'themes/michelebologna.zsh-theme')
-rw-r--r-- | themes/michelebologna.zsh-theme | 15 |
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='' |