[PATCH pve-kernel] scripts: make rebase interactive

[PATCH pve-kernel] scripts: make rebase interactive

[Fabian Grünbichler]

the rebase will often pick up stray commits that are not part of our patch set,
requiring manual intervention. making it interactive allows for quick
reviewing/adapting of the patch set.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
this has annoyed me quite a few times, and I had this as local diff temporarily

alternatively we could calculate the number of patches and rebase only a range,
but one of the failure scenarios is patches we have in our patch set no longer
being applicable, but not being auto-dropped either, which that would not
solve..

 debian/scripts/import-upstream-tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/scripts/import-upstream-tag b/debian/scripts/import-upstream-tag
index 6863595..6c86b99 100755
--- a/debian/scripts/import-upstream-tag
+++ b/debian/scripts/import-upstream-tag
@@ -92,7 +92,7 @@ if [[ -n "$rebase" ]]; then
     ## rebase patches
     echo ""
     echo "rebasing patchqueue on top of '${new_tag}'"
-    git rebase "${new_tag}"
+    git rebase --interactive "${new_tag}"
     cd "${top}"
 
     ## regenerate exported patch queue
-- 
2.47.3

applied: [PATCH pve-kernel] scripts: make rebase interactive

[Fabian Grünbichler]

On Wed, 08 Jul 2026 11:55:46 +0200, Fabian Grünbichler wrote:
> the rebase will often pick up stray commits that are not part of our patch set,
> requiring manual intervention. making it interactive allows for quick
> reviewing/adapting of the patch set.
> 
> 

Applied to master, trixie-6.17 and bookworm-6.8, since I've had to pick it
manually a few times since sending..

[1/1] scripts: make rebase interactive
      commit: ef3a4f3f25fd33d336957d84e0aecf5650548586

Best regards,
-- 
Fabian Grünbichler <f.gruenbichler@proxmox.com>