hvk: add hvk-stack

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 863972c46b4fac0f3d53dfe33eb8761d5676857c..477ed2738d6453481bbddad7b47491f92851058b 100644 (file)
--- 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 (file)
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}