1546e1226a7b739776bda43f264b221739ba0397

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

Fix badly resolved rebase conflict

Diff

 1diff --git a/lib/git.zsh b/lib/git.zsh
 2index 7affdec68c367d8bec1e6e14a0abf104b546708f..2054fe272843f6516e6a1641ca9bbad32dc7ac37 100644
 3--- a/lib/git.zsh
 4+++ b/lib/git.zsh
 5@@ -12,7 +12,7 @@ function git_prompt_info() {
 6 function parse_git_dirty() {
 7   local STATUS
 8   local -a FLAGS
 9-  FLAGS=('--porcelain' '--ignore-submodules=dirty')
10+  FLAGS=('--porcelain')
11   if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
12     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
13       FLAGS+='--untracked-files=no'