From ec51380fa58c00c04dc40d6137279188b956ca00 Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <pkarwasz-github@apache.org>
Date: Fri, 10 Jul 2026 15:39:38 +0200
Subject: [PATCH] =?UTF-8?q?Allow=20=E2=80=9CRebase=20and=20Merge=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sometimes it is useful to preserve the individual commits of a PR.
---
 .asf.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 7a2c14353e..36921d86b3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -48,10 +48,12 @@ github:
 
   # Enforce squashing while merging PRs.
   # Otherwise, the git log gets polluted severely.
+  #
+  # Exceptionally use `rebase` if individual commits are relevant.
   enabled_merge_buttons:
     squash: true
     merge: false
-    rebase: false
+    rebase: true
 
   features:
     issues: true