diff options
| author | Ramses Ladlani <ramses.ladlani@fishingcactus.com> | 2015-09-21 08:49:18 +0200 |
|---|---|---|
| committer | Ramses Ladlani <ramses.ladlani@fishingcactus.com> | 2015-09-21 08:49:18 +0200 |
| commit | 7576f856b915e6e02c5990cd7e221d7b9efbe44a (patch) | |
| tree | be3fe162edbc04946eea014a3612280d4909dc1e /themes/michelebologna.zsh-theme | |
| parent | 6e0fcf803fe00445c97861360d1b0806d8cc56b8 (diff) | |
| parent | 918d26e7dbcb907e673df24242c9688cd89019b9 (diff) | |
| download | zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.tar.gz zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.tar.bz2 zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.zip | |
Merge remote-tracking branch 'robyrussel/master' into fix-atom_plugin_for_cygwin
Discarded all previous changes to atom plugin for easier review in next commit.
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='' |