From 99245215ed9b5ece655c5a378e36c58a42e7f856 Mon Sep 17 00:00:00 2001
From: Martin Blazik <martin.blazik@gooddata.com>
Date: Thu, 19 Nov 2020 13:18:24 +0100
Subject: [PATCH] Refactor git aliases

---
 scripts/git-config.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/git-config.sh b/scripts/git-config.sh
index e15b718..48b1be5 100755
--- a/scripts/git-config.sh
+++ b/scripts/git-config.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-if [[ $1 == "-dry" ]]; then
+set -u
+
+ORIGIN=origin
+UPSTREAM=$ORIGIN
+MASTER=$UPSTREAM/master
+
+if [[ $# > 0 && "$1" == "-dry" ]]; then
   DRY=true
 else
   DRY=false
@@ -43,10 +49,11 @@ git_alias puf $'!sh -c \'git push -f origin $(git branch --show-current)\''
 
 git_alias rb rebase
 git_alias rbi "rebase -i --autosquash"
+git_alias rbim "rebase -i --autosquash $MASTER"
 git_alias rba "rebase --abort"
 git_alias rbc "rebase --continue"
 git_alias rbs "rebase --skip"
-git_alias rbom "rebase origin/master"
+git_alias rbm "rebase $MASTER"
 
 git_alias unstage "reset HEAD --"
 git_alias undo "reset --soft HEAD^"