public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-kernel] scripts: make rebase interactive
Date: Wed,  8 Jul 2026 11:55:46 +0200	[thread overview]
Message-ID: <20260708095722.339465-1-f.gruenbichler@proxmox.com> (raw)

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





                 reply	other threads:[~2026-07-08  9:57 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260708095722.339465-1-f.gruenbichler@proxmox.com \
    --to=f.gruenbichler@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal