fix(gitutils): 🐛 fix rebase

Author: tomgrv

src/gitutils/_git-fix-base.sh

@@ -6,7 +6,7 @@ eval $(
 		    p -      push     force push changes to remote
 		    d -      dryrun   show what would be done without making changes
 		    - target target    target branch to rebase commits onto
-			- source source    source branch to take commits from (default: current branch)
+		    - source source    source branch to take commits from (default: current branch)
 	help
 )
 

src/gitutils/_git-release-hotfix.sh

@@ -49,16 +49,15 @@ fi
 #### PREVENT GIT EDITOR PROMPT
 GIT_EDITOR=:
 
-current=$(echo "$main" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.X/')
+hotfix=$(echo "$main" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.X/')
 
 #### START HOTFIX
-git flow hotfix start $current
+git flow hotfix start $hotfix
 
 #### RESTORE STATUS AND HANDLE REBASE
 if [ -n "$rebase" ]; then
 
-    zz_log i "Rebasing: inverting develop and hotfix branches..."
-
-    git fix base hotfix/$current develop
+    zz_log i "Rebasing develop commits onto hotfix branch..."
+    git fix base -p hotfix/$hotfix
 fi