Skip to content

GitLab

Commit 1546e122 authored by Marc Cornellà's avatar Marc Cornellà
Browse files

Fix badly resolved rebase conflict

parent 4a9cd68e
Hide whitespace changes
Inline Side-by-side
lib/git.zsh
View file @ 1546e122
...@@ -12,7 +12,7 @@ function git_prompt_info() { ...@@ -12,7 +12,7 @@ function git_prompt_info() {
function parse_git_dirty() { function parse_git_dirty() {
local STATUS local STATUS
local -a FLAGS local -a FLAGS
FLAGS=('--porcelain' '--ignore-submodules=dirty') FLAGS=('--porcelain')
if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
FLAGS+='--untracked-files=no' FLAGS+='--untracked-files=no'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment