mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-25 15:20:08 +00:00
Merge pull request #4050 from mbologna/michelebologna_fix_git_prompt
Change to use omz git_prompt* functions
This commit is contained in:
commit
1324e6126c
1 changed files with 8 additions and 7 deletions
|
@ -59,16 +59,17 @@ ZSH_THEME_GIT_PROMPT_PREFIX=""
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="$blue%%"
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="*"
|
ZSH_THEME_GIT_PROMPT_MODIFIED="$red*"
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="+"
|
ZSH_THEME_GIT_PROMPT_ADDED="$green+"
|
||||||
ZSH_THEME_GIT_PROMPT_STASHED="$"
|
ZSH_THEME_GIT_PROMPT_STASHED="$blue$"
|
||||||
ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="="
|
ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="$green="
|
||||||
ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">"
|
ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">"
|
||||||
ZSH_THEME_GIT_PROMPT_BEHIND_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='$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 "
|
PROMPT+=" $last_command_output%#$reset "
|
||||||
RPROMPT=''
|
RPROMPT=''
|
||||||
|
|
Loading…
Reference in a new issue