git parent-branch && git update-parent-branch custom commands where added

Author: JohnDBR

.gitignore

@@ -1,2 +1,3 @@
 /tmp
+tmp
 Gemfile.lock

bin/git-parent-branch

@@ -0,0 +1,3 @@
+#!/bin/bash
+# Detect the base or parent remote branch (best guess)
+git log --pretty=format:'%d' --abbrev-commit --decorate-refs-exclude=refs/tags | grep origin | head -2 | tail -1 | sed '1s/tag:[^,]*, //g' | sed -nr '1s/.*\(([^,]+),?.*/\1/p' | cut -d ')' -f 1 | cut -d '(' -f 1

bin/git-update-parent-branch

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Detect the base or parent branch
+CURRENT_BRANCH=$(git current-branch)
+PARENT_BRANCH=$(git parent-branch)
+COMMIT_LIST=$(git rev-list $CURRENT_BRANCH...$PARENT_BRANCH)
+
+git checkout -b $CURRENT_BRANCH-temp
+git fetch
+
+git checkout $PARENT_BRANCH
+git branch -D $CURRENT_BRANCH
+git checkout -b $CURRENT_BRANCH
+
+set -- junk $COMMIT_LIST
+shift
+for commit_id; do
+  git cherry-pick "$commit_id"
+done
+
+git push --set-upstream origin -f $CURRENT_BRANCH
+
+git log --oneline --color --decorate --graph --all