From 45dc8a3c1fa2e8ca112c2b557e0a35b5027a0925 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 11 Mar 2026 09:47:19 +0100
Subject: [PATCH] make: improve rebase to auto-abort much like mfc target

---
 Mk/git.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mk/git.mk b/Mk/git.mk
index e1f88afd52..7c75a68610 100644
--- a/Mk/git.mk
+++ b/Mk/git.mk
@@ -99,7 +99,7 @@ ${CORE_MAINS}:
 
 rebase:
 	@${GIT} checkout ${CORE_STABLE}
-	@${GIT} rebase -i
+	@${GIT} rebase -i || ${GIT} rebase --abort
 	@${GIT} checkout ${CORE_MAIN}
 
 reset: