Merge branch 'master' into fix-git-commit-ahead-behind

This commit is contained in:
Steven Spasbo 2018-01-10 23:53:26 -08:00
commit bfc851dbc5
56 changed files with 1561 additions and 541 deletions

View file

@ -11,7 +11,7 @@ function git_prompt_info() {
# Checks if working tree is dirty
function parse_git_dirty() {
local STATUS=''
local FLAGS
local -a FLAGS
FLAGS=('--porcelain')
if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
if [[ $POST_1_7_2_GIT -gt 0 ]]; then