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: