diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2015-12-15 02:34:59 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2015-12-15 02:34:59 +0100 |
| commit | e344f4c0662bde84e720e723ab4a445df03e5100 (patch) | |
| tree | 7ce74d24f825e184508ed0872a3899104e60cfc4 /themes/mortalscumbag.zsh-theme | |
| parent | bfd2d8de24fc1ac9663f77a2fdffe40a403eefb7 (diff) | |
| parent | 9f552130bd0c390420a51bbfd2933c065a1581d0 (diff) | |
| download | zsh-e344f4c0662bde84e720e723ab4a445df03e5100.tar.gz zsh-e344f4c0662bde84e720e723ab4a445df03e5100.tar.bz2 zsh-e344f4c0662bde84e720e723ab4a445df03e5100.zip | |
Merge pull request #4420 from apjanke/git-move-current_branch-to-core
Git: move current_branch() to core
Diffstat (limited to 'themes/mortalscumbag.zsh-theme')
| -rw-r--r-- | themes/mortalscumbag.zsh-theme | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme index ccce4197a..55ece9760 100644 --- a/themes/mortalscumbag.zsh-theme +++ b/themes/mortalscumbag.zsh-theme @@ -5,7 +5,7 @@ function my_git_prompt() { STATUS="" # is branch ahead? - if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then + if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" fi @@ -37,7 +37,7 @@ function my_git_prompt() { } function my_current_branch() { - echo $(current_branch || echo "(no branch)") + echo $(git_current_branch || echo "(no branch)") } function ssh_connection() { |