mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-29 17:20:09 +00:00
Merge pull request #112 from lukerandall/master
Update theme to support fine grained git status
This commit is contained in:
commit
dd6cc96bb1
1 changed files with 15 additions and 1 deletions
|
@ -3,8 +3,22 @@
|
||||||
|
|
||||||
local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
|
local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
|
||||||
|
|
||||||
PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(git_prompt_info)%{$reset_color%}%B»%b '
|
function my_git_prompt_info() {
|
||||||
|
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
|
||||||
|
GIT_STATUS=$(git_prompt_status)
|
||||||
|
[[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS"
|
||||||
|
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(my_git_prompt_info)%{$reset_color%}%B»%b '
|
||||||
RPS1="${return_code}"
|
RPS1="${return_code}"
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
|
||||||
|
ZSH_THEME_GIT_PROMPT_ADDED="+"
|
||||||
|
ZSH_THEME_GIT_PROMPT_MODIFIED="*"
|
||||||
|
ZSH_THEME_GIT_PROMPT_RENAMED="~"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DELETED="!"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNMERGED="?"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue