diff --git a/.config/zsh/zshrc.d/30-alias.zsh b/.config/zsh/zshrc.d/30-alias.zsh index a16f5c6..1d62c03 100644 --- a/.config/zsh/zshrc.d/30-alias.zsh +++ b/.config/zsh/zshrc.d/30-alias.zsh @@ -34,7 +34,7 @@ alias gss='git stash' # https://nilansanjaya.wordpress.com/2017/06/02/git-find-base-branch/ git_bb='git show-branch -a 2>/dev/null' - git_bb+=' | grep "^[^[]*\*"' + git_bb+=' | grep "^[^[]*[*-].*\["' git_bb+=' | grep -v "^[^[]*\[$(git rev-parse --abbrev-ref HEAD)\]"' git_bb+=' | head -n1' git_bb+=' | sed -E "s/^[^[]*\[([^]~^]*).*$/\1/"'