From 83a537f2ef3d6606e2df5637c1e7e444a5efadce Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 19 Jul 2014 07:29:50 +0100
Subject: [PATCH] [bin] kernel-autobump: abort any possible rebase

---
 bin/kernel-autobump | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/kernel-autobump b/bin/kernel-autobump
index 3578c2b6..3b6a21ab 100755
--- a/bin/kernel-autobump
+++ b/bin/kernel-autobump
@@ -45,6 +45,7 @@ fi
 
 rollback() {
     cd "${REPO_PATH}" || return 1
+    git rebase --abort || true
     git reset --hard "${PUSH_REMOTE}/${BRANCH}" || return 1
 }