diff options
author | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2013-08-01 15:15:28 +0200 |
---|---|---|
committer | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2013-08-02 12:52:57 +0200 |
commit | e679734f4cb152400cd60f8285f8f325bc530786 (patch) | |
tree | cc5fd00a62a772644438b9d92e45e617f07d4643 /11_Colors.zsh | |
parent | 90f118fd8ed2e8958c55b3726354c3849e96a1cc (diff) |
[Git] Better ahead/behind/diverged managment (part 2)
Diffstat (limited to '11_Colors.zsh')
-rw-r--r-- | 11_Colors.zsh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/11_Colors.zsh b/11_Colors.zsh index ada1fdb..dd26149 100644 --- a/11_Colors.zsh +++ b/11_Colors.zsh @@ -81,10 +81,11 @@ __set_prompt_colors () _gcl_colors[init]="$color[black];$color[bold]" _gcl_colors[gitdir]="$color[red];$color[bold]" _gcl_colors[uptodate]="$_prompt_colors[generic]" + _gcl_colors[merging]="$color[bg-black]" _gcl_colors[changed]="$color[green]" _gcl_colors[cached]="$color[yellow];$color[bold]" _gcl_colors[mixed]="$color[green];$color[bold]" - _gcl_colors[merging]="$color[bg-black]" + _gcl_colors[stashes]="$color[white]" _gcl_colors[ffwd]="$color[red];$color[bold]" _gcl_colors[diverged]="$color[black];$color[bold]" |