`07594af1713639fa139101e302844049cbfa6144`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2013-12-03 07:08 UTC

Message

Merge pull request #639 from MarcoPeraza/git_unpushed

Show if you're ahead of remote in the wedisagree theme

Diff

 1diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
 2index 7cb27934dad51edbf31035070fe91309c8827e7b..9bdbce40dfddc7137214208c145b4090cdca2e90 100644
 3--- a/themes/wedisagree.zsh-theme
 4+++ b/themes/wedisagree.zsh-theme
 5@@ -25,7 +25,7 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
 6 
 7 # The right-hand prompt
 8 
 9-RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}'
10+RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
11 
12 # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
13 # %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} 
14@@ -46,6 +46,7 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ⚡"  # ⓜ ⑁
15 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" # ⓧ ⑂
16 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➜" # ⓡ ⑄
17 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ♒" # ⓤ ⑊
18+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%} 𝝙"
19 
20 # More symbols to choose from:
21 # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
22@@ -104,4 +105,4 @@ function git_time_since_commit() {
23             echo "($(rvm_gemset)$COLOR~|"
24         fi
25     fi
26-}
27+}