From 1546e1226a7b739776bda43f264b221739ba0397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 6 Nov 2019 19:46:52 +0100
Subject: [PATCH] Fix badly resolved rebase conflict

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 7affdec68..2054fe272 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -12,7 +12,7 @@ function git_prompt_info() {
 function parse_git_dirty() {
   local STATUS
   local -a FLAGS
-  FLAGS=('--porcelain' '--ignore-submodules=dirty')
+  FLAGS=('--porcelain')
   if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
       FLAGS+='--untracked-files=no'