From 48a29fb0c835250627166cb62a5d658dade3b0ac Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Mon, 2 Feb 2026 12:17:20 -0500 Subject: [PATCH] hvk: add hvk-stack Signed-off-by: Hugo Villeneuve --- scripts/Makefile.am | 1 + scripts/hvk-stack | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 scripts/hvk-stack diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 863972c..477ed27 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -26,6 +26,7 @@ dist_bin_SCRIPTS = \ hvk-rebase.sh \ hvk-save-defconfig.sh \ hvk-select.sh \ + hvk-stack \ hvk-x86.sh \ iso8859-to-utf8.sh \ kernel-send-patches.sh \ diff --git a/scripts/hvk-stack b/scripts/hvk-stack new file mode 100644 index 0000000..c526718 --- /dev/null +++ b/scripts/hvk-stack @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +SCRIPT="`readlink -e $0`" +SCRIPTPATH=$(dirname ${SCRIPT}) + +if [ ${#} -lt 1 -o ${#} -gt 2 ]; then + echo "Invalid number of arguments (1 or 2)" + exit 1 +fi + +if [ ${#} -eq 2 ]; then + branch_base="${1}" + branch_to_rebase="${2}" +elif [ ${#} -eq 1 ]; then + branch_base="$(git branch --show-current)" + branch_to_rebase="${1}" +fi + +git checkout "${branch_to_rebase}" +git rebase ${branch_base} -- 2.47.3