diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2014-11-19 18:33:00 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2014-11-19 18:40:18 +0100 |
| commit | a301f567e3a7ac2eb0b1f77d6ff97f50d63ba864 (patch) | |
| tree | 148cae1078fe4899a432cb1f26cdbebaa1d351bf /lib/git.zsh | |
| parent | df5b09e20b05a5ba4234599602f7a74934c916db (diff) | |
| download | zsh-a301f567e3a7ac2eb0b1f77d6ff97f50d63ba864.tar.gz zsh-a301f567e3a7ac2eb0b1f77d6ff97f50d63ba864.tar.bz2 zsh-a301f567e3a7ac2eb0b1f77d6ff97f50d63ba864.zip | |
Switch back to oh-my-zsh.hide-dirty setting again
Commit 81004dfaba509ff62a13ba303ab941938d619326 reverted the change
in 9b811fb625c03c30a766191cdf65a1c7c1fd96b2 when editing the merge
conflict from #2928.
This commit fixes that so that we don't make the same mistake again.
First seen in http://git.io/Cdaj5Q
Diffstat (limited to 'lib/git.zsh')
| -rw-r--r-- | lib/git.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index aba095422..748520a6f 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -13,7 +13,7 @@ parse_git_dirty() { local STATUS='' local FLAGS FLAGS=('--porcelain') - if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then + if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then if [[ $POST_1_7_2_GIT -gt 0 ]]; then FLAGS+='--ignore-submodules=dirty' fi |