[skip ci] Save: do not merge

2020-10-21 18:12:51 +02:00
1 changed files with 1 additions and 1 deletions
--- a/.bash_aliases
+++ b/.bash_aliases
@ -70,7 +70,7 @@ alias cont='git rebase --continue'

 alias branch_clean='git branch --merged | egrep -v "(^\*|master|dev)" | xargs git branch -d'

-alias git_parent='git show-branch | grep "[-\*] \[" | grep -v `git rev-parse --abbrev-ref HEAD` | head -n1 | sed "s/.*\[\(.*\)\].*/\1/"'
+alias git_parent='git show-branch | grep "[\*]" | grep -v `git rev-parse --abbrev-ref HEAD` | head -n1 | sed "s/.*\[\(.*\)\].*/\1/"'

 alias log='git log --graph --decorate --oneline'