summaryrefslogtreecommitdiff
path: root/01_Internal.zsh
diff options
context:
space:
mode:
authorHugues Hiegel <hugues.hiegel@qosmos.com>2012-10-25 10:23:03 +0200
committerHugues Hiegel <hugues.hiegel@qosmos.com>2012-10-25 10:23:03 +0200
commitfccb1c4a7db64b1b9edb1ddf19eb8ac91ac7cb54 (patch)
tree1ee3eee0f8429af5e9f3144ef36e26a3bcab529a /01_Internal.zsh
parent8e2075b98af312df47f5c76820d8b1f7bb893607 (diff)
[Git] Displays diverged among fast-forwardable heads.
Diffstat (limited to '01_Internal.zsh')
-rw-r--r--01_Internal.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/01_Internal.zsh b/01_Internal.zsh
index 48f3dcf..c7297fe 100644
--- a/01_Internal.zsh
+++ b/01_Internal.zsh
@@ -314,7 +314,7 @@ __get_git_status ()
fi
fi
- if [ $(git status | sed -n '2{/can be fast-forwarded/p};3q' | wc -l) -gt 0 ]
+ if [ $(git status | sed -n '2{/can be fast-forwarded/p;/have diverged/p};3q' | wc -l) -gt 0 ]
then
my_git_status+=";$_gcl_colors[ffwd]"
fi