[skip ci] Save: do not merge

This commit is contained in:
Robin-Charles Guihéneuf 2020-10-23 16:32:47 +02:00
parent bc3856dd22
commit 2d328d140d

View File

@ -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` | \
grep -v "HEAD" | \
sed "s/, /\n/g" | \
grep -v "tag:[^,]*,*" | \
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 "^$" | \
grep -v "HEAD" | \
sed "s/, /\n/g" | \
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