diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2012-10-30 16:59:06 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2012-10-30 16:59:06 +0100 |
| commit | 5640b4787396e2350ce3546fc9a682a13b0da75f (patch) | |
| tree | ef9b5386a46a34687898b9209a840241a6974c86 /01_Internal.zsh | |
| parent | 2afff89115115c9d3253cd3c9257b017a004ec61 (diff) | |
| parent | dcc2f0b098efd43ff7b172e471ece5739ea5ad3d (diff) | |
Merge branch 'master' of git:zdotdir
Conflicts:
99_Exec.zsh
Diffstat (limited to '01_Internal.zsh')
| -rw-r--r-- | 01_Internal.zsh | 2 |
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 |