From 839ec9913b1c4e93f2814675b4e6ffbda39d3b4c Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Fri, 13 May 2011 00:00:26 +0300 Subject: divergent upstream/local indictor --- git-prompt.sh | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3