Compare commits

..

2 Commits

View File

@ -91,11 +91,12 @@ 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' alias tag_clean='git tag -l | xargs git tag -d && git fetch -t'
function git_parent { function git_parent {
git log --pretty=format:"%D" HEAD^ | \ git log --pretty=format:"%D" HEAD^ | \
grep -v "^$" | \ grep -v "^$" | \
sed "s/, /\n/g" | \ grep -v `git rev-parse --abbrev-ref HEAD` | \
grep -v "tag:[^,]*,*" | \ sed "s/, /\n/g" | \
head -n1 | \ grep -v "tag:[^,]*,*" | \
head -n1 | \
sed "s/origin\/\([^,]*\)/\1/" sed "s/origin\/\([^,]*\)/\1/"
} }