[skip ci] Save: do not merge

.bash_aliases

@@ -56,13 +56,11 @@ function s_clean {
 alias vpn="sudo openvpn --config $HOME/Nextcloud/#\ -\ Configs/rguiheneuf.ovpn"
 
 # Git
-alias gst='git status'
+alias gs='git status'
 alias gc='git checkout'
 alias gcm='git checkout master'
 alias gpl='git pull'
 alias gph='git push'
-alias pull='git pull'
-alias push='git push'
 alias gsu='git submodule update --init'
 
 alias add='git add'
@@ -71,6 +69,10 @@ 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/" | sed "s/[\^~].*//"'
+
+alias log='git log --graph --decorate --oneline'
+
 function branch_create {
   git checkout -b $1
   git push -u origin $1
@@ -91,36 +93,42 @@ function tag_replace {
   git push origin $1
 }
 
-function grb {
-  git rebase -i HEAD~$1
-}
-
 function g_save {
   git add *
   git commit -m "[skip ci] Save: do not merge"
   git push -f
 }
 
-function grbm {
+function grb {
-  # Save actual branch
+  git rebase -i HEAD~$1
+}
+
+function grbi {
+  # Save current branch
   BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
 
-  # Checkout master & pull
+  # Save parent branch
-  git checkout master
+  PARENT=$(git_parent)
+
+  # Checkout parent & pull
+  git checkout ${PARENT}
   git pull
 
   # Back to previous branch
   git checkout ${BRANCH}
-  git rebase -i master
+  git rebase -i ${PARENT}
 }
 
-function grbr {
+function grbroot {
   git rebase --interactive --autosquash --root
 }
 
-function gam {
+function gai {
-  git autofixup master
+  # Save parent branch
-  git rebase --interactive --autosquash master
+  PARENT=$(git_parent)
+
+  git autofixup ${PARENT}
+  git rebase --interactive --autosquash ${PARENT}
 }
 
 function ga {