GitLab

This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.

<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing

re-implemented expired pull request https://github.com/robbyrussell/oh-my-zsh/pull/1759

changed ± to 

clearing up some confusion in issue#1906

agnoster theme was checking if the default virtualenv prompt was turned off and not showing its own... so there was no way to see which virtualenv was selected.

See http://www.virtualenv.org/en/latest/index.html\?highlight\=virtual_env_disable_prompt\#activate-script for info regarding this.

This reverts commit baffc3b0.

The code points have been updated in 53fbfe1, see
- https://github.com/Lokaltog/powerline/commit/53fbfe15fead8cc7598bcb4ee9714a221ab7e446
- https://github.com/Lokaltog/powerline/issues/4

IMPROVED: untracked file status has priority over modified (ie: if you have both modified and untracked files, your prompt will be red indicating the presence of untracked files)

This reverts commit f09af571.

It is far more aesthetically pleasing, and conveys the correct amount of information. The exact numeric status code is extremely rarely of use, and increases cognitive parsing burden on the user.
(cherry picked from commit 8f664edcaf55adcc540f0fe43d4205b66e4f9fb6)