From 2d328d140da8d5dc9dbfcef338446d1eb1b78828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin-Charles=20Guih=C3=A9neuf?= <robin-charles@hotmail.fr>
Date: Fri, 23 Oct 2020 16:32:47 +0200
Subject: [PATCH] [skip ci] Save: do not merge

---
 .bash_aliases | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 0428c84..7b2c946 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` | \
+    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