Fix badly resolved rebase conflict

7 years ago · 1546e1226a
parent 4a9cd68ea6
commit 1546e1226a
1 changed files with 1 additions and 1 deletions
--- 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'