make: improve rebase to auto-abort much like mfc target

2026-10-12 02:20:36 +00:00 · 2026-03-11 09:47:49 +01:00
parent 06a2025f3c
commit 45dc8a3c1f
1 changed files with 1 additions and 1 deletions
@@ -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: