diff --git a/.bash_aliases b/.bash_aliases index 0428c84..180ccb3 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -91,15 +91,27 @@ alias branch_clean='git branch --merged | egrep -v "(^\*|master|dev)" | xargs gi alias tag_clean='git tag -l | xargs git tag -d && git fetch -t' function git_parent { - git log --pretty=format:"%D" HEAD^ | \ + git log --pretty=format:"%D" | \ grep -v "^$" | \ - grep -v `git rev-parse --abbrev-ref HEAD` | \ sed "s/, /\n/g" | \ - grep -v "tag:[^,]*,*" | \ + grep -v "HEAD" | \ + grep -v `git rev-parse --abbrev-ref HEAD` | \ + grep -v "tag" | \ head -n1 | \ sed "s/origin\/\([^,]*\)/\1/" } +function git_parent_tag { + git log --pretty=format:"%D" | \ + grep -v "^$" | \ + sed "s/, /\n/g" | \ + grep -v "HEAD" | \ + grep -v `git rev-parse --abbrev-ref HEAD` | \ + head -n1 | \ + sed "s/origin\/\([^,]*\)/\1/" | \ + sed "s/tag: \([^,]*\)/\1/" +} + alias log='git log --graph --decorate --oneline' # Branch