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