diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2011-05-13 00:00:26 +0300 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2011-05-13 00:10:24 +0300 |
| commit | 839ec9913b1c4e93f2814675b4e6ffbda39d3b4c (patch) | |
| tree | b2499fba249dda4845c1628b77f01cf4854838e2 | |
| parent | Merge branch 'master' of github.com:lvv/git-prompt (diff) | |
| download | git-prompt-839ec9913b1c4e93f2814675b4e6ffbda39d3b4c.tar.gz git-prompt-839ec9913b1c4e93f2814675b4e6ffbda39d3b4c.tar.bz2 git-prompt-839ec9913b1c4e93f2814675b4e6ffbda39d3b4c.zip | |
divergent upstream/local indictor
| -rwxr-xr-x | git-prompt.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index 460d8e3..a7022d2 100755 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -426,8 +426,10 @@ parse_git_status() { s/^# On branch /branch=/p s/^nothing to commi.*/clean=clean/p s/^# Initial commi.*/init=init/p + s/^# Your branch is ahead of .[/[:alnum:]]\+. by [[:digit:]]\+ commit.*/freshness=${WHITE}↑/p s/^# Your branch is behind .[/[:alnum:]]\+. by [[:digit:]]\+ commit.*/freshness=${YELLOW}↓/p + s/^# Your branch and .[/[:alnum:]]\+. have diverged.*/freshness=${YELLOW}↕/p /^# Changes to be committed:/,/^# [A-Z]/ { s/^# Changes to be committed:/added=added;/p |