diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2019-11-06 19:46:52 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2019-11-06 19:46:52 +0100 |
| commit | 1546e1226a7b739776bda43f264b221739ba0397 (patch) | |
| tree | 994030644acb725a3dbeba4d48f9b901ecab9373 /lib/git.zsh | |
| parent | 4a9cd68ea630144d53e15bb47ef16f8d329ce0ca (diff) | |
| download | zsh-1546e1226a7b739776bda43f264b221739ba0397.tar.gz zsh-1546e1226a7b739776bda43f264b221739ba0397.tar.bz2 zsh-1546e1226a7b739776bda43f264b221739ba0397.zip | |
Fix badly resolved rebase conflict
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 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' |