diff --git a/.asf.yaml b/.asf.yaml
index 995b14099c60..2640905208cf 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -22,7 +22,10 @@ github:
     issues: false
     projects: false
   enabled_merge_buttons:
+    # "squash and merge" replaces committer with noreply@github, and we don't want that
+    # See https://lists.apache.org/thread/vxxpt1x316kjryb4dptsbs95p66d9xrv
     squash:  false
+    # We prefer linear history, so creating merge commits is disabled in UI
     merge:   false
     rebase:  true
 notifications: