diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fbaf5c7..6d957c4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,7 +6,7 @@
 
 - [ ] PR title follows Conventional Commits (it is linted)
 - [ ] `terraform fmt -recursive` is clean
-- [ ] `pre-commit run --all-files` passes (docs regenerated if inputs/outputs/resources changed)
+- [ ] `prek run --all-files` passes (docs regenerated if inputs/outputs/resources changed)
 - [ ] `terraform test` passes for any submodule I changed
 - [ ] Breaking input changes are described below (pre-1.0)
 
diff --git a/modules/repository/main.tf b/modules/repository/main.tf
index 07da275..25b7f0e 100644
--- a/modules/repository/main.tf
+++ b/modules/repository/main.tf
@@ -33,8 +33,12 @@ resource "github_repository" "internal" {
   allow_rebase_merge     = each.value.allow_rebase_merge
   allow_squash_merge     = each.value.allow_squash_merge
   delete_branch_on_merge = each.value.delete_branch_on_merge
-  merge_commit_message   = each.value.merge_commit_message
-  merge_commit_title     = each.value.merge_commit_title
+
+  # GitHub ignores the merge commit title/message unless merge commits are
+  # allowed and reports its own defaults back, so mirror those to avoid a
+  # perpetual diff.
+  merge_commit_message = each.value.allow_merge_commit ? each.value.merge_commit_message : "PR_TITLE"
+  merge_commit_title   = each.value.allow_merge_commit ? each.value.merge_commit_title : "MERGE_MESSAGE"
 
   dynamic "template" {
     for_each = each.value.template != null ? [each.value.template] : []