* [PATCH pve-kernel] scripts: make rebase interactive
@ 2026-07-08 9:55 Fabian Grünbichler
0 siblings, 0 replies; only message in thread
From: Fabian Grünbichler @ 2026-07-08 9:55 UTC (permalink / raw)
To: pve-devel
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-08 9:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-07-08 9:55 [PATCH pve-kernel] scripts: make rebase interactive Fabian Grünbichler
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.