diff --git a/triagebot.toml b/triagebot.toml
index 036a53b5e49..b17b415c0ff 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -414,6 +414,10 @@ message_on_add = """\
 Issue #{number} "{title}" has been added.
 """
 
+[no-merges]
+exclude_titles = ["Rollup of", "subtree update"]
+labels = ["has-merge-commits", "S-waiting-on-author"]
+
 [github-releases]
 format = "rustc"
 project-name = "Rust"