make: core releng additions

2026-05-22 18:44:07 -07:00 · 2021-03-30 09:43:05 +02:00
parent 30da21dcaf
commit a35d368f5d
1 changed files with 8 additions and 1 deletions
@@ -121,7 +121,9 @@ mfc: ensure-stable
 	fi
 .else
 	@git checkout stable/${PLUGIN_ABI}
-	@git cherry-pick -x ${MFC}
+	@if ! git cherry-pick -x ${MFC}; then \
+		git cherry-pick --abort; \
+	fi
 .endif
 	@git checkout master
 .endfor
@@ -131,3 +133,8 @@ stable:

 master:
 	@git checkout master
+
+rebase:
+	@git checkout stable/${PLUGIN_ABI}
+	@git rebase -i
+	@git checkout master