summaryrefslogtreecommitdiff
path: root/themes/lukerandall.zsh-theme
diff options
context:
space:
mode:
authorRoman Kamyk <roman.kamyk@gmail.com>2011-09-15 12:56:40 +0200
committerRoman Kamyk <roman.kamyk@gmail.com>2011-09-15 12:56:40 +0200
commit2b55ee07534ec34a699805dc35ca83ad8e22fc7a (patch)
tree97f464ca865626aea1aa135e7eb9f629f4017171 /themes/lukerandall.zsh-theme
parentf71647fa85267d558d0d69034902f53aeeed67ad (diff)
parent762b55bb2bc0452ce3f5f2f21bc22b61936ef704 (diff)
downloadzsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.gz
zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.bz2
zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.zip
Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'themes/lukerandall.zsh-theme')
-rw-r--r--themes/lukerandall.zsh-theme16
1 files changed, 15 insertions, 1 deletions
diff --git a/themes/lukerandall.zsh-theme b/themes/lukerandall.zsh-theme
index 24a0612b7..f4045bd8e 100644
--- a/themes/lukerandall.zsh-theme
+++ b/themes/lukerandall.zsh-theme
@@ -3,8 +3,22 @@
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}"
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
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="?"
+