diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2019-08-05 23:26:23 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2019-08-05 23:26:23 +0300 |
| commit | 9d6dfeae736267a00c10dcae82e4a04ca72d4e4e (patch) | |
| tree | e3612ba3faec629f4535d4abf9334719412c6117 | |
| parent | 96b59dab349ee678112a1fe46eaad9e18b6eacc9 (diff) | |
add POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM
| -rw-r--r-- | config/p10k-classic.zsh | 2 | ||||
| -rw-r--r-- | config/p10k-lean.zsh | 2 | ||||
| -rwxr-xr-x | internal/p10k.zsh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh index 4946a28a..b0fc9a86 100644 --- a/config/p10k-classic.zsh +++ b/config/p10k-classic.zsh @@ -322,7 +322,7 @@ fi typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION=${${vcs//\%f}//\%<->F} typeset -g POWERLEVEL9K_VCS_LOADING_FOREGROUND=244 # Enable counters for staged, unstaged, etc. - typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 + typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 # Icon color. typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76 diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh index 8b994bbd..ef9ab648 100644 --- a/config/p10k-lean.zsh +++ b/config/p10k-lean.zsh @@ -306,7 +306,7 @@ fi typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION=${${vcs//\%f}//\%<->F} typeset -g POWERLEVEL9K_VCS_LOADING_FOREGROUND=244 # Enable counters for staged, unstaged, etc. - typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 + typeset -g POWERLEVEL9K_VCS_{STAGED,UNSTAGED,UNTRACKED,CONFLICTED,COMMITS_AHEAD,COMMITS_BEHIND}_MAX_NUM=-1 # Icon color. typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_COLOR=76 diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 2a751e65..aec5e24c 100755 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -3638,6 +3638,7 @@ _p9k_init_params() { _p9k_declare -i POWERLEVEL9K_VCS_STAGED_MAX_NUM 1 _p9k_declare -i POWERLEVEL9K_VCS_UNSTAGED_MAX_NUM 1 _p9k_declare -i POWERLEVEL9K_VCS_UNTRACKED_MAX_NUM 1 + _p9k_declare -i POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM 1 _p9k_declare -i POWERLEVEL9K_VCS_COMMITS_AHEAD_MAX_NUM -1 _p9k_declare -i POWERLEVEL9K_VCS_COMMITS_BEHIND_MAX_NUM -1 _p9k_declare -b POWERLEVEL9K_DISABLE_GITSTATUS 0 @@ -4141,6 +4142,7 @@ _p9k_init() { -s $_POWERLEVEL9K_VCS_STAGED_MAX_NUM \ -u $_POWERLEVEL9K_VCS_UNSTAGED_MAX_NUM \ -d $_POWERLEVEL9K_VCS_UNTRACKED_MAX_NUM \ + -c $_POWERLEVEL9K_VCS_CONFLICTED_MAX_NUM \ -m $_POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY \ POWERLEVEL9K || _POWERLEVEL9K_DISABLE_GITSTATUS=1 fi |