From f58c5fdb27f1c1454562c91981b1ea0397a2174e Mon Sep 17 00:00:00 2001 From: druckdev Date: Sat, 15 May 2021 22:17:45 +0200 Subject: [PATCH] zsh:alias: Combine both regexs in git-base-branch --- .config/zsh/zshrc.d/30-alias.zsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.config/zsh/zshrc.d/30-alias.zsh b/.config/zsh/zshrc.d/30-alias.zsh index 7f6f826..da182a0 100644 --- a/.config/zsh/zshrc.d/30-alias.zsh +++ b/.config/zsh/zshrc.d/30-alias.zsh @@ -37,8 +37,7 @@ git_bb+=' | grep "\*"' git_bb+=' | grep -v "$(git rev-parse --abbrev-ref HEAD)"' git_bb+=' | head -n1' - git_bb+=' | sed "s/.*\[\(.*\)\].*/\1/"' - git_bb+=' | sed "s/[\^~].*//"' + git_bb+=' | sed -E "s/^.*\[([^^~\]*)([~^].*)?\].*$/\1/"' alias git-base-branch="$git_bb" unset git_bb # https://stackoverflow.com/a/1549155